Fix reconnect devices

Author: csutorasa

XOutput/Devices/Mapper/InputMapper.cs

@@ -84,7 +84,7 @@ public void Attach(IEnumerable<IInputDevice> inputDevices)
                         {
                             if (mapperData.InputDevice == inputDevice.UniqueId)
                             {
-                                mapperData.Source = inputDevice.Sources.FirstOrDefault(s => s.Offset.ToString() == mapperData.InputType);
+                                mapperData.SetSourceWithoutSaving(inputDevice.Sources.FirstOrDefault(s => s.Offset.ToString() == mapperData.InputType));
                                 inputs.Add(inputDevice);
                                 found = true;
                                 break;
@@ -93,7 +93,7 @@ public void Attach(IEnumerable<IInputDevice> inputDevices)
                     }
                     if (!found)
                     {
-                        mapperData.Source = DisabledInputSource.Instance;
+                        mapperData.SetSourceWithoutSaving(DisabledInputSource.Instance);
                     }
                 }
             }

XOutput/Devices/Mapper/MapperData.cs

@@ -91,5 +91,13 @@ public double GetValue(double value)
             }
             return mappedValue;
         }
+        public void SetSourceWithoutSaving(InputSource value) 
+        {
+            var newValue = value ?? DisabledInputSource.Instance;
+            if (newValue != source)
+            {
+                source = newValue;
+            }
+        }
     }
 }

XOutput/UI/Windows/MainWindowViewModel.cs

@@ -40,7 +40,7 @@ public MainWindowViewModel(MainWindowModel model, Dispatcher dispatcher, HidGuar
         {
             this.dispatcher = dispatcher;
             this.hidGuardianManager = hidGuardianManager;
-            timer.Interval = TimeSpan.FromMilliseconds(10000);
+            timer.Interval = TimeSpan.FromMilliseconds(5000);
             timer.Tick += (object sender1, EventArgs e1) => { RefreshGameControllers(); };
             timer.Start();
         }
@@ -216,6 +216,7 @@ public void RefreshGameControllers()
         {
             IEnumerable<SharpDX.DirectInput.DeviceInstance> instances = directInputDevices.GetInputDevices(Model.AllDevices);
 
+            bool changed = false;
             foreach (var inputView in Model.Inputs.ToArray())
             {
                 var device = inputView.ViewModel.Model.Device;
@@ -225,6 +226,7 @@ public void RefreshGameControllers()
                     InputDevices.Instance.Remove(device);
                     inputView.ViewModel.Dispose();
                     device.Dispose();
+                    changed = true;
                 }
             }
             foreach (var instance in instances)
@@ -240,8 +242,18 @@ public void RefreshGameControllers()
                     device.Disconnected -= DispatchRefreshGameControllers;
                     device.Disconnected += DispatchRefreshGameControllers;
                     Model.Inputs.Add(new InputView(new InputViewModel(new InputModel(), device, Model.IsAdmin)));
+                    changed = true;
                 }
             }
+            if (changed)
+            {
+                foreach (var controller in Controllers.Instance.GetControllers())
+                {
+                    var mapper = settings.CreateMapper(controller.Mapper.Id);
+                    controller.Mapper.Mappings = mapper.Mappings;
+                }
+                Controllers.Instance.Update(InputDevices.Instance.GetDevices());
+            }
         }
 
         public void AddController(InputMapper mapper)