The-Homebrew-Cloud/cemu-DS4Windows
2
0
Fork 0
mirror of https://github.com/cemu-project/DS4Windows.git synced 2024-12-24 15:41:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'jay' into vigem-udpserver

Browse Source 
# Conflicts:
#	DS4Windows/DS4Control/ControlService.cs
This commit is contained in:
Travis Nickles 2018-08-24 17:38:00 -05:00
commit 77af92e722
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
DS4Windows/DS4Control/ControlService.cs
View File

@ -1118,7 +1118,11 @@ namespace DS4Windows
lag[ind] = false;
inWarnMonitor[ind] = false;
useDInputOnly[ind] = true;
OnControllerRemoved(this, ind);
uiContext?.Post(new SendOrPostCallback((state) =>
{
OnControllerRemoved(this, ind);
}), null);
//Thread.Sleep(XINPUT_UNPLUG_SETTLE_TIME);
}
}
}

3
DS4Windows/DS4Forms/DS4Form.cs
View File

@ -2174,14 +2174,15 @@ Properties.Resources.DS4Update, MessageBoxButtons.YesNo, MessageBoxIcon.Question
FormLocationX = Location.X > 0 ? Location.X : 0;
FormLocationY = Location.Y > 0 ? Location.Y : 0;
Global.ControllerRemoved -= ControllerRemovedChange;
if (!string.IsNullOrEmpty(appdatapath))
{
Save();
blankControllerTab();
Program.rootHub.Stop();
}
TaskRunner.Run(() => Program.rootHub.Stop()).Wait();
// Make sure to stop event generation routines. Should fix odd crashes on shutdown
Application.Exit();
}