Fixed app quit issues (win), #2225

toggl-open-source · Oct 25, 2017 · e30d0ad · e30d0ad
1 parent 39eec43
commit e30d0ad
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 9 deletions.
diff --git a/src/ui/windows/TogglDesktop/TogglDesktop/ui/KeyboardShortcuts.cs b/src/ui/windows/TogglDesktop/TogglDesktop/ui/KeyboardShortcuts.cs
@@ -286,14 +286,7 @@ private static void onLogout(object sender, RoutedEventArgs e)
 
         private static void onQuit(object sender, RoutedEventArgs e)
         {
-            if (mainWindow.IsVisible)
-            {
-                mainWindow.Close();
-            }
-            else
-            {
-                Environment.Exit(0);
-            }
+            mainWindow.shutdown(0);
         }
 
         #endregion

diff --git a/src/ui/windows/TogglDesktop/TogglDesktop/ui/windows/MainWindow.xaml.cs b/src/ui/windows/TogglDesktop/TogglDesktop/ui/windows/MainWindow.xaml.cs
@@ -653,7 +653,7 @@ public void ShowOnTop()
             this.Activate();
         }
 
-        private void shutdown(int exitCode)
+        public void shutdown(int exitCode)
         {
             if (this.closing)
                 return;