Fix #53, application crashes when exiting from system tray while

also listening for voice input. Thanks cr0ss0vr.
baykovr · Aug 27, 2016 · 9d4f2f1 · 9d4f2f1
1 parent 74029a7
commit 9d4f2f1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/GAVPI/GAVPI/Core/GAVPI.cs b/GAVPI/GAVPI/Core/GAVPI.cs
@@ -252,12 +252,13 @@ static private void Exit( object SelectedMenuItem, EventArgs e )
 
             Properties.Settings.Default.Save();
 
+            // Stop listening.
+            StopListening(null, null);
+
             //  And get rid of the system tray icon.
             if (sysTrayIcon != null)
             {
-                // strackoverflow tip:
-                // trayicon must be set to null in order to keep it from lingering in the tray.
-                // Robert (04.23.15)
+                // Tray icon must be set to null in order to keep it from lingering in the tray.
                 sysTrayIcon.Visible = false;
                 sysTrayIcon.Dispose();
                 sysTrayIcon = null;

diff --git a/GAVPI/GAVPI/GUI/frmGAVPI.cs b/GAVPI/GAVPI/GUI/frmGAVPI.cs
@@ -53,7 +53,7 @@ private void frmGAVPI_Activated( object sender, System.EventArgs e )
 
         private void frmGAVPI_FormClosing( object sender, FormClosingEventArgs e )
         {
-            if (GAVPI.IsFirstClose)
+            if (GAVPI.IsFirstClose && GAVPI.sysTrayIcon != null)
             {
                 GAVPI.sysTrayIcon.BalloonTipTitle = "GAVPI is still running.";
                 GAVPI.sysTrayIcon.BalloonTipText =