fix achievement check status save

DGP-Studio · Sep 13, 2023 · 53c484c · 53c484c
1 parent 706f894
commit 53c484c
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 6 deletions.
diff --git a/src/Snap.Hutao/Snap.Hutao/Control/Behavior/InvokeCommandOnLoadedBehavior.cs b/src/Snap.Hutao/Snap.Hutao/Control/Behavior/InvokeCommandOnLoadedBehavior.cs
@@ -21,7 +21,7 @@ protected override void OnAttached()
         base.OnAttached();
 
         // FrameworkElement in a ItemsRepeater gets attached twice
-        if (!executed && AssociatedObject is FrameworkElement { IsLoaded: true })
+        if (AssociatedObject is FrameworkElement { IsLoaded: true })
         {
             TryExecuteCommand();
         }
@@ -35,6 +35,11 @@ protected override void OnAssociatedObjectLoaded()
 
     private void TryExecuteCommand()
     {
+        if (executed)
+        {
+            return;
+        }
+
         if (Command is not null && Command.CanExecute(CommandParameter))
         {
             Command.Execute(CommandParameter);

diff --git a/src/Snap.Hutao/Snap.Hutao/Core/LifeCycle/Activation.cs b/src/Snap.Hutao/Snap.Hutao/Core/LifeCycle/Activation.cs
@@ -270,10 +270,18 @@ private async ValueTask HandleLaunchGameActionAsync(string? uid = null)
         }
         else
         {
-            await serviceProvider
-                .GetRequiredService<INavigationService>()
-                .NavigateAsync<View.Page.LaunchGamePage>(INavigationAwaiter.Default, true)
-                .ConfigureAwait(false);
+            if (currentWindowReference.Window is MainWindow)
+            {
+                await serviceProvider
+                    .GetRequiredService<INavigationService>()
+                    .NavigateAsync<View.Page.LaunchGamePage>(INavigationAwaiter.Default, true)
+                    .ConfigureAwait(false);
+            }
+            else
+            {
+                // We have a non-Main Window, just exit current process anyway
+                Process.GetCurrentProcess().Kill();
+            }
         }
     }
 }
diff --git a/src/Snap.Hutao/Snap.Hutao/ViewModel/Achievement/AchievementView.cs b/src/Snap.Hutao/Snap.Hutao/ViewModel/Achievement/AchievementView.cs
@@ -55,7 +55,7 @@ public bool IsChecked
             {
                 (Entity.Status, Entity.Time) = value
                     ? (AchievementStatus.STATUS_REWARD_TAKEN, DateTimeOffset.Now)
-                    : (AchievementStatus.STATUS_FINISHED, default);
+                    : (AchievementStatus.STATUS_INVALID, default);
 
                 OnPropertyChanged(nameof(Time));
             }