Improved balloon tips and fixed focus for new window instances

TheDuffman85 · Feb 24, 2015 · 3c1b6d1 · 3c1b6d1
1 parent ee0b2ab
commit 3c1b6d1
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 19 deletions.
diff --git a/Synology Download Station Adapter/Adapter.cs b/Synology Download Station Adapter/Adapter.cs
@@ -72,22 +72,27 @@ public static Form VisibleForm
         {
             get
             {
-                if (frmDownloadStation.Instance.Visible)
-                {
-                    return frmDownloadStation.Instance;
-                }
-                else if(frmSelectHoster.Instance.Visible)
-                {
-                    return frmSelectHoster.Instance;
-                }
-                else if (frmAddLinks.Instance.Visible)
-                {
-                    return frmAddLinks.Instance;
-                }
-                else 
-                {
-                    return frmSettings.Instance;
-                }
+
+                return (Form)frmSettings.Instance.Invoke(new Func<Form>(
+                        delegate
+                        {
+                            if (frmDownloadStation.Instance.Visible)
+                            {
+                                return frmDownloadStation.Instance;
+                            }
+                            else if (frmSelectHoster.Instance.Visible)
+                            {
+                                return frmSelectHoster.Instance;
+                            }
+                            else if (frmAddLinks.Instance.Visible)
+                            {
+                                return frmAddLinks.Instance;
+                            }
+                            else
+                            {
+                                return frmSettings.Instance;
+                            }
+                        }));               
             }
         }
 
@@ -283,7 +288,14 @@ private static void WebRequestCallback(IAsyncResult result)
 
                 if (decrypter != null)
                 {
-                    decrypter.Decrypt();                   
+                    try
+                    {
+                        decrypter.Decrypt();
+                    }
+                    catch (Exception ex)
+                    {
+                        Adapter.ShowBalloonTip(ex.Message, ToolTipIcon.Error);
+                    }          
 
                     if (Properties.Settings.Default.ShowDecryptedLinks)
                     {

diff --git a/Synology Download Station Adapter/frmDownloadStation.cs b/Synology Download Station Adapter/frmDownloadStation.cs
@@ -20,7 +20,7 @@ public partial class frmDownloadStation : Form
         #region Variables
 
         private static object _lock = new object();
-        private static frmDownloadStation _instance;
+        private static frmDownloadStation _instance = new frmDownloadStation();
         private bool _newInstance = false;
 
         #endregion

diff --git a/Synology Download Station Adapter/frmSettings.cs b/Synology Download Station Adapter/frmSettings.cs
@@ -322,7 +322,18 @@ private void contextMenuStrip_Opening(object sender, CancelEventArgs e)
 
         private void notifyIcon_MouseDoubleClick(object sender, MouseEventArgs e)
         {
-            Adapter.OpenDownloadStation();
+            if (Adapter.VisibleForm.InvokeRequired)
+            {
+                Adapter.VisibleForm.Invoke((MethodInvoker)(() =>
+                {
+                    Adapter.OpenDownloadStation();
+                }
+                ));
+            }
+            else
+            {
+                Adapter.OpenDownloadStation();
+            }            
         }
 
         #endregion