WPF shutdown fix. Fix for aliases getting erased. Sort device grid.

immense · Feb 14, 2020 · 5687406 · 5687406
1 parent 6cc3857
commit 5687406
Show file tree

Hide file tree

Showing 8 changed files with 43 additions and 382 deletions.
diff --git a/Desktop.Win/App.xaml.cs b/Desktop.Win/App.xaml.cs
@@ -29,18 +29,8 @@ private void Application_DispatcherUnhandledException(object sender, System.Wind
 
         private void Application_Exit(object sender, ExitEventArgs e)
         {
-            var conductor = ServiceContainer.Instance.GetRequiredService<Conductor>();
-            foreach (var viewer in conductor.Viewers.Values.ToArray())
-            {
-                try
-                {
-                    viewer.Dispose();
-                }
-                catch (Exception ex)
-                {
-                    Logger.Write(ex);
-                }
-            }
+            // Hack to fix application not exiting when window closed.
+            Environment.Exit(0);
         }
 
         private void Application_Startup(object sender, StartupEventArgs e)

diff --git a/Server/Services/DataService.cs b/Server/Services/DataService.cs
@@ -489,11 +489,19 @@ public void SetDeviceSetupOptions(string deviceID, DeviceSetupOptions options)
             var device = RemotelyContext.Devices.FirstOrDefault(x => x.ID == deviceID);
             if (device != null)
             {
-                device.Alias = options.DeviceAlias;
-                var group = RemotelyContext.DeviceGroups.FirstOrDefault(x => 
+                if (!string.IsNullOrWhiteSpace(options.DeviceAlias))
+                {
+                    device.Alias = options.DeviceAlias;
+                }
+
+                if (!string.IsNullOrWhiteSpace(options.DeviceGroup))
+                {
+                    var group = RemotelyContext.DeviceGroups.FirstOrDefault(x =>
                     x.Name.ToLower() == options.DeviceGroup.ToLower() &&
                     x.OrganizationID == device.OrganizationID);
-                device.DeviceGroup = group;
+                    device.DeviceGroup = group;
+                }
+
                 RemotelyContext.SaveChanges();
             }
         }

diff --git a/Server/wwwroot/Downloads/Install-Win10-x64.ps1 b/Server/wwwroot/Downloads/Install-Win10-x64.ps1