Merge pull request #18 from thoblerone/master

Fixes Issue #17

Author: graham22

CommonControls/DataTab.Designer.cs

@@ -56,12 +56,13 @@ public ushort DataLength
                 ushort rVal = 64;
                 try
                 {
-                    if (txtSize.Text.IndexOf("0x", 0, txtSize.Text.Length) == 0)
+                    if (txtSize.Text.StartsWith("0x", StringComparison.InvariantCultureIgnoreCase))
                     {
                         string str = txtSize.Text.Replace("0x", "");
                         rVal = Convert.ToUInt16(str, 16);
                     }
-                    rVal = Convert.ToUInt16(txtSize.Text);
+                    else
+                        rVal = Convert.ToUInt16(txtSize.Text);
                 }
                 catch (Exception)
                 {
@@ -71,7 +72,13 @@ public ushort DataLength
             }
             set
             {
-                txtSize.Text = Convert.ToString(value);
+                if (txtSize.Text.StartsWith("0x", StringComparison.InvariantCultureIgnoreCase))
+                {
+                    // obey hex input
+                    txtSize.Text = "0x"+Convert.ToString(value, 16);
+                }
+                else
+                    txtSize.Text = Convert.ToString(value);
             }
         }