IceChat 9.53

* Fix bug with not being able to bring up the server editor, created an Exception
icechat · Feb 3, 2022 · 1d7dcd7 · 1d7dcd7
1 parent 8182abc
commit 1d7dcd7
Show file tree

Hide file tree

Showing 7 changed files with 223 additions and 396 deletions.
diff --git a/build/Manual_MSBuild_ReleaseVersion_LOG.log b/build/Manual_MSBuild_ReleaseVersion_LOG.log
diff --git a/changelog.txt b/changelog.txt
@@ -1,10 +1,12 @@
+Build 9.53 Feb 2 2022
+* Fix bug with not being able to bring up the server editor, created an Exception
+
 Build 9.52 Jan 9 2022
 * Fix bug when using -profile and directory is inaccessible
 * Fix bug with $+ not properly joining words
 * Fix bug with control codes in notes for server editor
 * Fix bug with control codes in multiline aliases
 
-
 Build 9.51 July 14 2021
 * Alt 0-9 keys select nth window (Alt-0 is Console)
 * Removed Hyperlink color option, URL's will use normal text color, still will be underlined

diff --git a/src/IceChat/Classes/Colors.cs b/src/IceChat/Classes/Colors.cs
@@ -51,7 +51,7 @@ public class IceChatColors
         private int _tabBarServerQuit = 9;
         private int _tabBarServerMessage = 13;
         private int _tabBarOtherMessage = 6;
-        private int _tabBarDefault = 1;
+        private int _tabBarDefault = 0;
 
         private int _tabBarNewAction = 4;
         private int _tabBarServerNotice = 13;
@@ -63,7 +63,7 @@ public class IceChatColors
         private int _tabBarOtherBG2 = 15;
         private int _tabBarHoverBG1 = 0;
         private int _tabBarHoverBG2 = 7;
-        private int _tabbarBack = 20;
+        private int _tabBarBack = 20;
 
         private int _consoleTabHighlite = 4;
 
@@ -139,7 +139,7 @@ public int InputboxForeColor
 
         [XmlElement("TabbarBackColor")]
         public int TabbarBackColor
-        { get { return _tabbarBack; } set { _tabbarBack = value; } }
+        { get { return _tabBarBack; } set { _tabBarBack = value; } }
 
         [XmlElement("MenubarBackColor")]
         public int MenubarBackColor

diff --git a/src/IceChat/Controls/ServerTree.cs b/src/IceChat/Controls/ServerTree.cs
@@ -2111,33 +2111,44 @@ private void ButtonEdit_Click(object sender, EventArgs e)
         {
             //open up the Server Editor
             //check if a server is selected or not
-            if (Application.OpenForms["FormServers"] as FormServers != null)
-            {
-                Application.OpenForms["FormServers"].BringToFront();
-                return;
-            }            
-
-            if (selectedServerID > 0)
-            {
-                f = new FormServers(GetServerSetting(selectedServerID));
-                f.SaveServer += new FormServers.SaveServerDelegate(OnSaveServer);
-                f.NewServer += new FormServers.NewServerDelegate(OnNewServer);
-                f.SaveDefaultServer += new FormServers.SaveDefaultServerDelegate(OnSaveDefaultServer);
+            try { 
+
+                if (Application.OpenForms["FormServers"] as FormServers != null)
+                {
+                    Application.OpenForms["FormServers"].BringToFront();
+                    return;
+                }
+
+                ServerSetting ss = GetServerSetting(selectedServerID);
+
+                if (selectedServerID > 0 && ss != null)
+                {
+                    f = new FormServers(ss);
+                    f.SaveServer += new FormServers.SaveServerDelegate(OnSaveServer);
+                    //f.NewServer += new FormServers.NewServerDelegate(OnNewServer);
+                    f.SaveDefaultServer += new FormServers.SaveDefaultServerDelegate(OnSaveDefaultServer);
+                }
+                else
+                {
+                    f = new FormServers();
+                    f.NewServer += new FormServers.NewServerDelegate(OnNewServer);
+                    f.SaveDefaultServer += new FormServers.SaveDefaultServerDelegate(OnSaveDefaultServer);
+                }
+
+                f.Show(this.Parent);
+
             }
-            else
+            catch(Exception ex)
             {
-                f = new FormServers();
-                f.NewServer += new FormServers.NewServerDelegate(OnNewServer);
-                f.SaveDefaultServer += new FormServers.SaveDefaultServerDelegate(OnSaveDefaultServer);
+                FormMain.Instance.WindowMessage(FormMain.Instance.InputPanel.CurrentConnection, "Console", "\x000304EditServerBtn Error:" + selectedServerID + ":" + ex.Message + ":" + ex.Source, "", true);
             }
 
-            f.Show(this.Parent);
-        }
-
-        /// <summary>
-        /// Save the Default Server Settings
-        /// </summary>
-        private void OnSaveDefaultServer()
+}
+
+/// <summary>
+/// Save the Default Server Settings
+/// </summary>
+private void OnSaveDefaultServer()
         {
             if (SaveDefault != null)
                 SaveDefault();
@@ -2312,21 +2323,32 @@ private void ForceDisconnectToolStripMenuItem_Click(object sender, EventArgs e)
 
         private void EditToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            if (selectedServerID > 0)
+            try
             {
-                f = new FormServers(GetServerSetting(selectedServerID));
-                f.SaveServer += new FormServers.SaveServerDelegate(OnSaveServer);
-                f.SaveDefaultServer += new FormServers.SaveDefaultServerDelegate(OnSaveDefaultServer);
+
+                ServerSetting ss = GetServerSetting(selectedServerID);
+
+                if (selectedServerID > 0 && ss != null)
+                {                    
+                    f = new FormServers(ss);
+                    f.SaveServer += new FormServers.SaveServerDelegate(OnSaveServer);
+                    f.SaveDefaultServer += new FormServers.SaveDefaultServerDelegate(OnSaveDefaultServer);
+                }
+                else
+                {
+                    f = new FormServers();
+                    f.NewServer += new FormServers.NewServerDelegate(OnNewServer);
+                    f.SaveDefaultServer += new FormServers.SaveDefaultServerDelegate(OnSaveDefaultServer);
+                }
+
+                f.Show(this.Parent);
+
+
             }
-            else
+            catch(Exception ex)
             {
-                f = new FormServers();
-                f.NewServer += new FormServers.NewServerDelegate(OnNewServer);
-                f.SaveDefaultServer += new FormServers.SaveDefaultServerDelegate(OnSaveDefaultServer);
+                FormMain.Instance.WindowMessage(FormMain.Instance.InputPanel.CurrentConnection, "Console", "\x000304EditServer Error:" + selectedServerID + ":" + ex.Message + ":" + ex.Source, "", true);
             }
-
-            f.Show(this.Parent);
-
         }
 
         private void AutoJoinToolStripMenuItem_Click(object sender, EventArgs e)

diff --git a/src/IceChat/Forms/FormMain.cs b/src/IceChat/Forms/FormMain.cs