mirror of
https://github.com/cemu-project/DS4Windows.git
synced 2024-12-24 23:51:49 +01:00
Merge branch 'jay' into vigem-udpserver
# Conflicts: # DS4Windows/DS4Control/ControlService.cs
This commit is contained in:
commit
77af92e722
@ -1118,7 +1118,11 @@ namespace DS4Windows
|
|||||||
lag[ind] = false;
|
lag[ind] = false;
|
||||||
inWarnMonitor[ind] = false;
|
inWarnMonitor[ind] = false;
|
||||||
useDInputOnly[ind] = true;
|
useDInputOnly[ind] = true;
|
||||||
|
uiContext?.Post(new SendOrPostCallback((state) =>
|
||||||
|
{
|
||||||
OnControllerRemoved(this, ind);
|
OnControllerRemoved(this, ind);
|
||||||
|
}), null);
|
||||||
|
//Thread.Sleep(XINPUT_UNPLUG_SETTLE_TIME);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -2174,14 +2174,15 @@ Properties.Resources.DS4Update, MessageBoxButtons.YesNo, MessageBoxIcon.Question
|
|||||||
|
|
||||||
FormLocationX = Location.X > 0 ? Location.X : 0;
|
FormLocationX = Location.X > 0 ? Location.X : 0;
|
||||||
FormLocationY = Location.Y > 0 ? Location.Y : 0;
|
FormLocationY = Location.Y > 0 ? Location.Y : 0;
|
||||||
|
Global.ControllerRemoved -= ControllerRemovedChange;
|
||||||
|
|
||||||
if (!string.IsNullOrEmpty(appdatapath))
|
if (!string.IsNullOrEmpty(appdatapath))
|
||||||
{
|
{
|
||||||
Save();
|
Save();
|
||||||
blankControllerTab();
|
blankControllerTab();
|
||||||
Program.rootHub.Stop();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
TaskRunner.Run(() => Program.rootHub.Stop()).Wait();
|
||||||
// Make sure to stop event generation routines. Should fix odd crashes on shutdown
|
// Make sure to stop event generation routines. Should fix odd crashes on shutdown
|
||||||
Application.Exit();
|
Application.Exit();
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user