Changeset 15 for Common/ComboBoxEx.cs

Timestamp:

Jun 18, 2024, 12:15:33 PM (5 months ago)

Author:

chronos

Message:

• Modified: Updated files.

File:

• Common/ComboBoxEx.cs (modified) (3 diffs)

Common/ComboBoxEx.cs

@@ -8 +8 @@
     public partial class ComboBoxEx : ComboBox
     {
-        public string regSubKey;
-        public int maxHistoryCount;
+        public string RegSubKey;
+        public int MaxHistoryCount;
 
         public ComboBoxEx()
         {
             InitializeComponent();
-            regSubKey = Name;
-            maxHistoryCount = 20;
+            RegSubKey = Name;
+            MaxHistoryCount = 20;
         }
 
@@ -23 +23 @@
             {
                 BeginUpdate();
-                string previousText = Text;
-                int index = Items.IndexOf(Text);
-                if (index >= 0) Items.RemoveAt(index);
-                Text = previousText;
-                Items.Insert(0, previousText);
+                try
+                {
+                    string previousText = Text;
+                    int index = Items.IndexOf(Text);
+                    if (index >= 0) Items.RemoveAt(index);
+                    Text = previousText;
+                    Items.Insert(0, previousText);
 
-                while (Items.Count > maxHistoryCount)
-                    Items.RemoveAt(Items.Count - 1);
-                EndUpdate();
+                    while (Items.Count > MaxHistoryCount)
+                        Items.RemoveAt(Items.Count - 1);
+                }
+                finally
+                {
+                    EndUpdate();
+                }
             }
         }
@@ -37 +43 @@
         public void LoadFromRegistry()
         {
-            RegistryKey regKey = Application.UserAppDataRegistry.OpenSubKey(regSubKey);
-            if (regKey == null) regKey = Application.UserAppDataRegistry.CreateSubKey(regSubKey);
+            RegistryKey regKey = Application.UserAppDataRegistry.OpenSubKey(RegSubKey) ?? 
+                                 Application.UserAppDataRegistry.CreateSubKey(RegSubKey);
 
             int count = regKey.GetValueInt("Count", 0);
             BeginUpdate();
-            while (Items.Count > count) Items.RemoveAt(Items.Count - 1);
-            while (Items.Count < count) Items.Add("");
-            for (int i = 0; i < count; i++)
+            try
             {
-                Items[i] = (string)regKey.GetValue(i.ToString(), "");
+                while (Items.Count > count) Items.RemoveAt(Items.Count - 1);
+                while (Items.Count < count) Items.Add("");
+                for (int i = 0; i < count; i++)
+                {
+                    Items[i] = (string)regKey.GetValue(i.ToString(), "");
+                }
             }
-            EndUpdate();
+            finally
+            {
+                EndUpdate();
+            }
         }
 
         public void SaveToRegistry()
         {
-            RegistryKey regKey = Application.UserAppDataRegistry.OpenSubKey(regSubKey, true);
-            if (regKey == null) regKey = Application.UserAppDataRegistry.CreateSubKey(regSubKey);
+            RegistryKey regKey = Application.UserAppDataRegistry.OpenSubKey(RegSubKey, true) ?? 
+                                 Application.UserAppDataRegistry.CreateSubKey(RegSubKey);
 
             int i = 0;