Merge pull request #328 from madman2021/dev

Fixed Trayicon Exit button
benrhughes · Jan 15, 2017 · 4602a8b · 4602a8b
2 parents c362a72 + f1e124e
commit 4602a8b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/Client/Controls/MainWindow.xaml.cs b/Client/Controls/MainWindow.xaml.cs
@@ -257,7 +257,7 @@ public void OptionsExecuted(object sender, RoutedEventArgs e)
             ViewModel.ShowOptionsDialog();
         }
 
-        private void ExitApplicationExecuted(object sender, RoutedEventArgs e)
+        public void ExitApplicationExecuted(object sender, RoutedEventArgs e)
         {
             Application.Current.Shutdown();
         }

diff --git a/Client/TrayMainWindows.cs b/Client/TrayMainWindows.cs
@@ -54,11 +54,9 @@ private void DoubleClick(object sender, EventArgs args)
         private void ExitClick(object sender, EventArgs args)
         {
             // Close the application by triggering the File-Exit menu item click handler.
-            System.Windows.Controls.MenuItem exitMenuItem = (System.Windows.Controls.MenuItem)_window.FindName("menuFileExit");
-            if (exitMenuItem != null)
-            {
-                exitMenuItem.RaiseEvent(new RoutedEventArgs(System.Windows.Controls.MenuItem.ClickEvent, exitMenuItem));
-            }
+            var mainWindow = _window as MainWindow;
+            mainWindow?.ExitApplicationExecuted(null, null);
+
         }
 
         public void Dispose()