fix misc issues

Author: aspriddell

DragonFruit.OnionFruit.Core.Windows/WindowsNetworkAdapterManager.cs

@@ -17,7 +17,7 @@ public class WindowsNetworkAdapterManager : IDisposable, INetworkAdapterManager
     {
         private const string WmiNamespace = @"root\cimv2";
         private const string WmiNetworkAdapterQuery = "SELECT Description,SettingID FROM Win32_NetworkAdapterConfiguration WHERE IPEnabled = 'TRUE'";
-        private const string WmiNetworkAdapterEventQuery = "SELECT * FROM __InstanceCreationEvent WITHIN 2 WHERE TargetInstance ISA 'Win32_NetworkAdapterConfiguration' AND TargetInstance.IPEnabled = TRUE";
+        private const string WmiNetworkAdapterEventQuery = "SELECT * FROM __InstanceCreationEvent WITHIN 10 WHERE TargetInstance ISA 'Win32_NetworkAdapterConfiguration' AND TargetInstance.IPEnabled = TRUE";
 
         private const string DnsRegistryPath = @"SYSTEM\CurrentControlSet\Services\Tcpip{0}\Parameters\Interfaces";
         private const string ProxySettingsPath = @"Software\Microsoft\Windows\CurrentVersion\Internet Settings";
@@ -40,6 +40,7 @@ public void Init()
         {
             try
             {
+                _proxyRegistry?.Dispose();
                 _proxyRegistry = Registry.CurrentUser.OpenSubKey(ProxySettingsPath, RegistryKeyPermissionCheck.ReadWriteSubTree, RequiredRegistryAccess);
             }
             catch (SecurityException)
@@ -48,13 +49,18 @@ public void Init()
 
             try
             {
+                _tcpipConfigRegistry?.Dispose();
+                _tcpip6ConfigRegistry?.Dispose();
+
                 _tcpipConfigRegistry = Registry.LocalMachine.OpenSubKey(string.Format(DnsRegistryPath, string.Empty), RegistryKeyPermissionCheck.ReadWriteSubTree, RequiredRegistryAccess);
                 _tcpip6ConfigRegistry = Registry.LocalMachine.OpenSubKey(string.Format(DnsRegistryPath, "6"), RegistryKeyPermissionCheck.ReadWriteSubTree, RequiredRegistryAccess);
             }
             catch (SecurityException)
             {
             }
 
+            _wmiEventWatcher?.Dispose();
+
             _wmiEventWatcher = new ManagementEventWatcher(WmiNamespace, WmiNetworkAdapterEventQuery);
             _wmiEventWatcher.EventArrived += WmiEventHandler;
             _wmiEventWatcher.Start();

DragonFruit.OnionFruit.Windows/WindowsAppInstanceManager.cs

@@ -37,7 +37,7 @@ public bool RelaunchProcess(bool elevated)
 
             var startInfo = new ProcessStartInfo(file)
             {
-                Arguments = string.Concat(' ', Environment.GetCommandLineArgs()),
+                Arguments = string.Join(' ', Environment.GetCommandLineArgs()),
                 WorkingDirectory = Environment.CurrentDirectory,
                 UseShellExecute = true,
                 Verb = elevated ? "runas" : null