extension to the fix for #1124

CHANGELOG.TXT

@@ -1,3 +1,10 @@
+1.76.10 (2018-10-07):
+
+Fixes:
+------
+#1124: Enabling themes causes an exception
+
+
 1.76.9 (2018-10-07):
 
 Fixes:

mRemoteV1/Properties/AssemblyInfo.cs

@@ -33,5 +33,5 @@ using System.Runtime.InteropServices;
 // by using the '*' as shown below:
 // <Assembly: AssemblyVersion("1.0.*")>
 
-[assembly: AssemblyVersion("1.76.9.*")]
+[assembly: AssemblyVersion("1.76.10.*")]
 [assembly: NeutralResourcesLanguage("en")]

mRemoteV1/UI/Forms/frmMain.cs

@@ -253,17 +253,33 @@ namespace mRemoteNG.UI.Forms
         private void ApplyTheme()
 		{
 		    if (!_themeManager.ThemingActive) return;
-		    
-            // Persist settings when rebuilding UI
-		    pnlDock.Theme = _themeManager.ActiveTheme.Theme;
 
-            vsToolStripExtender.SetStyle(msMain, _themeManager.ActiveTheme.Version, _themeManager.ActiveTheme.Theme);
-		    vsToolStripExtender.SetStyle(_quickConnectToolStrip, _themeManager.ActiveTheme.Version, _themeManager.ActiveTheme.Theme);
-		    vsToolStripExtender.SetStyle(_externalToolsToolStrip, _themeManager.ActiveTheme.Version, _themeManager.ActiveTheme.Theme);
-		    vsToolStripExtender.SetStyle(_multiSshToolStrip, _themeManager.ActiveTheme.Version, _themeManager.ActiveTheme.Theme);
-		    tsContainer.TopToolStripPanel.BackColor = _themeManager.ActiveTheme.ExtendedPalette.getColor("CommandBarMenuDefault_Background");
-		    BackColor = _themeManager.ActiveTheme.ExtendedPalette.getColor("Dialog_Background");
-		    ForeColor = _themeManager.ActiveTheme.ExtendedPalette.getColor("Dialog_Foreground");
+		    try
+		    {
+                // this will always throw when turning themes on from
+                // the options menu.
+		        pnlDock.Theme = _themeManager.ActiveTheme.Theme;
+		    }
+		    catch (Exception)
+		    {
+		        // intentionally ignore exception
+		    }
+            
+		    // Persist settings when rebuilding UI
+		    try
+		    {
+                vsToolStripExtender.SetStyle(msMain, _themeManager.ActiveTheme.Version, _themeManager.ActiveTheme.Theme);
+		        vsToolStripExtender.SetStyle(_quickConnectToolStrip, _themeManager.ActiveTheme.Version, _themeManager.ActiveTheme.Theme);
+		        vsToolStripExtender.SetStyle(_externalToolsToolStrip, _themeManager.ActiveTheme.Version, _themeManager.ActiveTheme.Theme);
+		        vsToolStripExtender.SetStyle(_multiSshToolStrip, _themeManager.ActiveTheme.Version, _themeManager.ActiveTheme.Theme);
+		        tsContainer.TopToolStripPanel.BackColor = _themeManager.ActiveTheme.ExtendedPalette.getColor("CommandBarMenuDefault_Background");
+		        BackColor = _themeManager.ActiveTheme.ExtendedPalette.getColor("Dialog_Background");
+		        ForeColor = _themeManager.ActiveTheme.ExtendedPalette.getColor("Dialog_Foreground");
+		    }
+		    catch (Exception ex)
+		    {
+                Runtime.MessageCollector.AddExceptionStackTrace("Error applying theme", ex, MessageClass.WarningMsg);
+		    }
         }
 
         private void frmMain_Shown(object sender, EventArgs e)

mRemoteV1/UI/Window/ConnectionTreeWindow.cs

@@ -18,7 +18,6 @@ namespace mRemoteNG.UI.Window
 {
     public partial class ConnectionTreeWindow
 	{
-	    private readonly ConnectionContextMenu _contextMenu;
         private readonly IConnectionInitiator _connectionInitiator = new ConnectionInitiator();
 		private ThemeManager _themeManager;
 
@@ -90,7 +89,7 @@ namespace mRemoteNG.UI.Window
         {
             if (!_themeManager.ThemingActive) return;
             vsToolStripExtender.SetStyle(msMain, _themeManager.ActiveTheme.Version, _themeManager.ActiveTheme.Theme);
-            vsToolStripExtender.SetStyle(_contextMenu, _themeManager.ActiveTheme.Version, _themeManager.ActiveTheme.Theme);
+            vsToolStripExtender.SetStyle(olvConnections.ContextMenuStrip, _themeManager.ActiveTheme.Version, _themeManager.ActiveTheme.Theme);
             //Treelistview need to be manually themed
             olvConnections.BackColor = _themeManager.ActiveTheme.ExtendedPalette.getColor("TreeView_Background");
             olvConnections.ForeColor = _themeManager.ActiveTheme.ExtendedPalette.getColor("TreeView_Foreground");