Fix a crash on macOS entering an invalid value for pool port

nwoolls · Dec 29, 2017 · 5f26b06 · 5f26b06
1 parent aaaa374
commit 5f26b06
Show file tree

Hide file tree

Showing 2 changed files with 65 additions and 12 deletions.
diff --git a/MultiMiner.Win/Forms/Configuration/PoolsForm.Designer.cs b/MultiMiner.Win/Forms/Configuration/PoolsForm.Designer.cs
diff --git a/MultiMiner.Win/Forms/Configuration/PoolsForm.cs b/MultiMiner.Win/Forms/Configuration/PoolsForm.cs
@@ -402,6 +402,7 @@ private void coinListBox_DrawItem(object sender, DrawItemEventArgs e)
         private void miningPoolBindingSource_CurrentChanged(object sender, EventArgs e)
         {
             PopulateWorkerNames();
+            PopulatePort();
         }
 
         private void PopulateWorkerNames()
@@ -443,13 +444,17 @@ private void userNameCombo_SelectedIndexChanged(object sender, EventArgs e)
         //parse the port out for folks that paste in host:port
         private void hostEdit_Validated(object sender, EventArgs e)
         {
-            if (miningPoolBindingSource.Current != null)
-                ParseHostForPort();
+            ParseHostForPort();
         }
 
         private void ParseHostForPort()
         {
             MiningPool currentPool = (MiningPool)miningPoolBindingSource.Current;
+            if (currentPool == null)
+            {
+                return;
+            }
+
             int newPort;
             string newHost;
 
@@ -615,5 +620,52 @@ private bool ValidateHostText(string hostText)
             }
             return true;
         }
+
+        // begin port handling - don't databind as it crashes on macOS when an invalid value is entered (e.g. alpha or no value - delete port)
+        private void portEdit_Validating(object sender, System.ComponentModel.CancelEventArgs e)
+        {
+            string portText = ((TextBox)sender).Text;
+            e.Cancel = !ValidatePortText(portText);
+        }
+
+        private bool ValidatePortText(string portText)
+        {
+            int port;
+            bool isValid = Int32.TryParse(portText, out port);
+            if (isValid)
+            {
+                return true;
+            }
+            else
+            {
+                MessageBox.Show(String.Format("The specified value '{0}' is not a valid port.", portText), "Invalid Port", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                return false;
+            }
+        }
+
+        private void portEdit_Validated(object sender, EventArgs e)
+        {
+            MiningPool currentPool = (MiningPool)miningPoolBindingSource.Current;
+            if (currentPool == null)
+            {
+                return;
+            }
+
+            string portText = ((TextBox)sender).Text;
+            currentPool.Port = Int32.Parse(portText); // already know it's valid from the Validating event
+        }
+
+        private void PopulatePort()
+        {
+            MiningPool currentPool = (MiningPool)miningPoolBindingSource.Current;
+            if (currentPool == null)
+            {
+                return;
+            }
+
+            portEdit.Text = currentPool.Port.ToString();
+        }
+
+        // end port handling
     }
 }