From 44fdc4160e77c1d774dd3960083a64054f29dbf7 Mon Sep 17 00:00:00 2001
From: "Michael J. Seiferling" <mseiferling@gmail.com>
Date: Wed, 2 Aug 2017 11:39:19 -0600
Subject: [PATCH] Fixed some long standing system tray bugs

---
 GBM/Forms/frmMain.vb                 | 23 +++++++++++------------
 GBM/My Project/Resources.Designer.vb |  9 +++++++++
 GBM/My Project/Resources.resx        |  3 +++
 3 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/GBM/Forms/frmMain.vb b/GBM/Forms/frmMain.vb
index 6498d26..31c81b2 100644
--- a/GBM/Forms/frmMain.vb
+++ b/GBM/Forms/frmMain.vb
@@ -1037,11 +1037,15 @@ Public Class frmMain
             Me.ShowInTaskbar = True
             Me.Focus()
         Else
-            bShowToggle = False
-            wState = Me.WindowState
-            Me.WindowState = FormWindowState.Minimized
-            Me.ShowInTaskbar = False
-            Me.Visible = False
+            If Me.CanFocus Then
+                bShowToggle = False
+                wState = Me.WindowState
+                Me.WindowState = FormWindowState.Minimized
+                Me.ShowInTaskbar = False
+                Me.Visible = False
+            Else
+                gMonTray.ShowBalloonTip(5000, App_NameLong, App_ErrorFocus, ToolTipIcon.Info)
+            End If
         End If
     End Sub
 
@@ -1147,6 +1151,7 @@ Public Class frmMain
             If Not bGameDetected Then
                 gMonTrayMon.Enabled = False
                 gMonTrayShow.Enabled = False
+                gMonTrayExit.Enabled = False
             End If
             bMenuEnabled = False
         Else
@@ -1162,6 +1167,7 @@ Public Class frmMain
             gMonTraySettings.Enabled = True
             gMonTrayMon.Enabled = True
             gMonTrayShow.Enabled = True
+            gMonTrayExit.Enabled = True
             bMenuEnabled = True
         End If
     End Sub
@@ -1631,13 +1637,6 @@ Public Class frmMain
         End If
     End Sub
 
-    Private Sub gMonTray_BalloonTipClicked(sender As System.Object, e As System.EventArgs) Handles gMonTray.BalloonTipClicked
-        bShowToggle = True
-        Me.Visible = True
-        Me.ShowInTaskbar = True
-        Me.Focus()
-    End Sub
-
     Private Sub btnCancelOperation_Click(sender As Object, e As EventArgs) Handles btnCancelOperation.Click
         OperationCancel()
     End Sub
diff --git a/GBM/My Project/Resources.Designer.vb b/GBM/My Project/Resources.Designer.vb
index 89ad774..7eae80c 100644
--- a/GBM/My Project/Resources.Designer.vb	
+++ b/GBM/My Project/Resources.Designer.vb	
@@ -78,6 +78,15 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Looks up a localized string similar to GBM is busy with an open window on your desktop..
+        '''</summary>
+        Friend ReadOnly Property App_ErrorFocus() As String
+            Get
+                Return ResourceManager.GetString("App_ErrorFocus", resourceCulture)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Looks up a localized string similar to This function is currently not available on a Unix based operating system..
         '''</summary>
diff --git a/GBM/My Project/Resources.resx b/GBM/My Project/Resources.resx
index b9a5d75..be8cac5 100644
--- a/GBM/My Project/Resources.resx	
+++ b/GBM/My Project/Resources.resx	
@@ -1798,4 +1798,7 @@
   <data name="mgrBackup_7zFatalError" xml:space="preserve">
     <value>[PARAM] backup failed due to an error.</value>
   </data>
+  <data name="App_ErrorFocus" xml:space="preserve">
+    <value>GBM is busy with an open window on your desktop.</value>
+  </data>
 </root>
\ No newline at end of file