Skip to content

Commit

Permalink
bugFix
Browse files Browse the repository at this point in the history
  • Loading branch information
NoobNotFound committed May 24, 2023
1 parent 0c1718c commit 012fa32
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Emerald.App/Emerald.App.Package/Package.WinUI.wapproj
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
<AppxPackageSigningTimestampDigestAlgorithm>SHA256</AppxPackageSigningTimestampDigestAlgorithm>
<AppxAutoIncrementPackageRevision>False</AppxAutoIncrementPackageRevision>
<GenerateTestArtifacts>True</GenerateTestArtifacts>
<AppxBundlePlatforms>x64</AppxBundlePlatforms>
<AppxBundlePlatforms>x86|x64|arm64</AppxBundlePlatforms>
<AppInstallerUri>D:\Projects\Emerald\Emerald.App\Emerald.App.Package\AppPackages\</AppInstallerUri>
<HoursBetweenUpdateChecks>0</HoursBetweenUpdateChecks>
<AppxSymbolPackageEnabled>False</AppxSymbolPackageEnabled>
Expand Down
3 changes: 1 addition & 2 deletions Emerald.App/Emerald.App/Views/Settings/AboutPage.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
using System.Threading.Tasks;
using Windows.ApplicationModel.DataTransfer;
using SS = Emerald.WinUI.Helpers.Settings.SettingsSystem;

namespace Emerald.WinUI.Views.Settings;

public sealed partial class AboutPage : Page, INotifyPropertyChanged
Expand Down Expand Up @@ -137,6 +136,7 @@ private async void LoadBackup_Click(object sender, RoutedEventArgs e)
{
if (await WindowsHelloResult())
{
var b = (SettingsBackup)lvBackups.SelectedItems[0];
if (!(await SS.GetBackups()).Where(x => x.Backup == SS.Settings.Serialize()).Any())
{
var r = await MessageBox.Show("Warning".Localize(), "SettingsLoadWarn".Localize(), MessageBoxButtons.YesNoCancel);
Expand All @@ -145,7 +145,6 @@ private async void LoadBackup_Click(object sender, RoutedEventArgs e)
if (r == MessageBoxResults.Yes)
await SS.CreateBackup(SS.Settings.Serialize());

var b = (SettingsBackup)lvBackups.SelectedItems[0];
UpdateBackupList();
App.Current.LoadFromBackupSettings(b.Backup);
}
Expand Down

0 comments on commit 012fa32

Please sign in to comment.