Resolve issues with configurator being clumsy on first use

Author: NathanCastle

BSCP/Configurator/ConfigModel.cs

@@ -89,25 +89,37 @@ public ConfigModel(String name, String defaultCommand, String defaultConsole, Bo
         /// </summary>
         public void readOrUpdateFromRegistry()
         {
-            var command_key = Registry.GetValue(app_key_base + "\\" + Name, "command", null);
-            var console_key = Registry.GetValue(app_key_base + "\\" + Name, "console", null);
+            var command_key = Registry.GetValue(get_full_name(), "command", null);
+            var console_key = Registry.GetValue(get_full_name(), "console", null);
+            var xming_key = Registry.GetValue(get_full_name(), "xming", null);
+            var name_key = Registry.GetValue(get_full_name(), "name", null);
             if (command_key == null)
             {
                 //insert key & set value
                 Registry.SetValue(get_full_name(), "command", this.DefaultCommand);
+                command_key = Registry.GetValue(app_key_base + "\\" + Name, "command", null);
+            } 
 
-            } else
-            {
-                this.Command = command_key.ToString();
-            }
+            this.Command = command_key.ToString();
 
             if (console_key == null)
             {
                 Registry.SetValue(get_full_name(), "console", this.DefaultConsole);
-            } else
+                console_key = Registry.GetValue(app_key_base + "\\" + Name, "console", null);
+            } 
+            
+            this.Console = console_key.ToString();
+
+            if (xming_key == null)
             {
-                this.Console = console_key.ToString();
+                Registry.SetValue(get_full_name(), "xming", this._usesXming.ToString());
             }
+
+            if (name_key == null)
+            {
+                Registry.SetValue(get_full_name(), "name", this.Name);
+            }
+            
         }
 
         public void pushToRegistry()

BSCP/Configurator/MainWindow.xaml.cs

@@ -27,6 +27,8 @@ public partial class MainWindow : Window
         public MainWindow()
         {
             context = new ObservableCollection<ConfigModel>();
+            InitializeComponent();
+            lstView.ItemsSource = context;
             var hkcl = Microsoft.Win32.Registry.LocalMachine;
             try
             {
@@ -45,11 +47,7 @@ public MainWindow()
                 context.Add(new ConfigModel("Mate", "-c \"cd ~/ && DISPLAY=:0 exec mate-session\"", "bash.exe"));
                 context.Add(new ConfigModel("Windows Explorer", "/C \"explorer.exe\"", "cmd.exe", false));
             }
-
-                
-
-            InitializeComponent();
-            lstView.ItemsSource = context;
+            
             foreach (var item in context)
             {
                 item.readOrUpdateFromRegistry();
@@ -127,28 +125,37 @@ private void Disable_button_Click(object sender, RoutedEventArgs e)
             {
                 item.delete();
             }
-            //unregister credential provider
             var hklm = Microsoft.Win32.Registry.LocalMachine;
+            //delete shell key parent
+            hklm.OpenSubKey("SOFTWARE\\Castle\\BootShellCredentialProvider", true).DeleteSubKey("Shells");
+            hklm.OpenSubKey("SOFTWARE\\Castle", true).DeleteSubKey("BootShellCredentialProvider");
+            hklm.OpenSubKey("SOFTWARE", true).DeleteSubKey("Castle");
+            //unregister credential provider
             try
             {
                 var subkey = hklm.OpenSubKey(credential_key_s, true);
                 subkey.DeleteSubKey("{" + credential_provider_guid + "}");
             }
-            catch (ArgumentException) { }
+            catch (ArgumentException) { }//do nothing, already deleted
+            catch (NullReferenceException) { }//do nothing, already deleted
             var hkcl = Microsoft.Win32.Registry.ClassesRoot;
             try
             {
                 var subkey = hkcl.OpenSubKey("CLSID\\{" + credential_provider_guid + "}", true);
                 subkey.DeleteSubKey("InprocServer32");
                 var parent_key = hkcl.OpenSubKey("CLSID", true);
                 parent_key.DeleteSubKey("{" + credential_provider_guid + "}");
-            } catch (ArgumentException) { }
+            }
+            catch (ArgumentException) { }
+            catch (NullReferenceException) { }
 
             //unregister configurableShell
             try
             {
                 Registry.SetValue(winlogonKey_full, "Userinit", userInitSetting_reset);
-            } catch (ArgumentException) { }
+            }
+            catch (ArgumentException) { }
+            catch (NullReferenceException) { }
         }
 
         private void New_Button_Click(object sender, RoutedEventArgs e)