Fix LorisYounger#332

Core00-GS · Mar 9, 2024 · 53b728a · 53b728a
1 parent bcd1b6f
commit 53b728a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 12 deletions.
diff --git a/.gitignore b/.gitignore
@@ -354,3 +354,4 @@ MigrationBackup/
 *_PDLC_*
 *_DLC_*
 VPet-Simulator.Windows/mod/1111_ChatGPTPlus
+VPet.Solution/Properties/launchSettings.json
diff --git a/VPet.Solution/App.xaml.cs b/VPet.Solution/App.xaml.cs
@@ -8,13 +8,10 @@ namespace VPet.Solution;
 /// </summary>
 public partial class App : Application
 {
-    public static bool IsDone { get; set; } = false;
-
     protected override void OnStartup(StartupEventArgs e)
     {
         if (e.Args != null && e.Args.Count() > 0)
         {
-            IsDone = true;
             switch (e.Args[0].ToLower())
             {
                 case "removestarup":
@@ -25,12 +22,12 @@ protected override void OnStartup(StartupEventArgs e)
                     {
                         File.Delete(path);
                     }
-                    return;
+                    break;
                 case "launchsteam":
                     Process.Start("steam://rungameid/1920960");
-                    return;
+                    break;
             }
+            Application.Current.Shutdown();
         }
-        IsDone = false;
     }
 }
diff --git a/VPet.Solution/Views/MainWindow.xaml.cs b/VPet.Solution/Views/MainWindow.xaml.cs
@@ -24,12 +24,7 @@ public partial class MainWindow : WindowX
     public SaveWindow SaveWindow { get; } = new();
 
     public MainWindow()
-    {
-        if (App.IsDone)
-        {
-            Close();
-            return;
-        }
+    {        
         InitializeComponent();
         this.SetViewModel<MainWindowVM>();
         Closed += MainWindow_Closed;