The-Homebrew-Cloud/cemu-DS4Windows
2
0
Fork 0
mirror of https://github.com/cemu-project/DS4Windows.git synced 2024-11-30 04:54:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Added UnregisterNotify call

Browse Source
This commit is contained in:
Travis Nickles 2018-10-16 23:06:39 -05:00
parent 2029cc5531
commit 7d871c0709
1 changed files with 43 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
DS4Windows/DS4Forms/DS4Form.cs
View File

@ -62,8 +62,9 @@ namespace DS4Windows
{ "DS4Windows v" + FileVersionInfo.GetVersionInfo(Assembly.GetExecutingAssembly().Location).FileVersion, { "DS4Windows v" + FileVersionInfo.GetVersionInfo(Assembly.GetExecutingAssembly().Location).FileVersion,
string.Empty, string.Empty, string.Empty, string.Empty }; string.Empty, string.Empty, string.Empty, string.Empty };
internal const string UPDATER_VERSION = "1.2.8.0"; private const string UPDATER_VERSION = "1.2.8.0";
internal static int WM_QUERYENDSESSION = 0x11; private const int WM_QUERYENDSESSION = 0x11;
private const int WM_CLOSE = 0x10;
internal string updaterExe = Environment.Is64BitProcess ? "DS4Updater.exe" : "DS4Updater_x86.exe"; internal string updaterExe = Environment.Is64BitProcess ? "DS4Updater.exe" : "DS4Updater_x86.exe";
[DllImport("user32.dll")] [DllImport("user32.dll")]
@ -1041,7 +1042,9 @@ Properties.Resources.DS4Update, MessageBoxButtons.YesNo, MessageBoxIcon.Question
private const int DBT_DEVICEREMOVECOMPLETE = 0x8004; private const int DBT_DEVICEREMOVECOMPLETE = 0x8004;
protected override void WndProc(ref Message m) protected override void WndProc(ref Message m)
{ {
if (m.Msg == ScpDevice.WM_CREATE) switch (m.Msg)
{
case ScpDevice.WM_CREATE:
{ {
Guid hidGuid = new Guid(); Guid hidGuid = new Guid();
NativeMethods.HidD_GetHidGuid(ref hidGuid); NativeMethods.HidD_GetHidGuid(ref hidGuid);
@ -1052,8 +1055,9 @@ Properties.Resources.DS4Update, MessageBoxButtons.YesNo, MessageBoxIcon.Question
ScpForm_Closing(this, ScpForm_Closing(this,
new FormClosingEventArgs(CloseReason.ApplicationExitCall, false)); new FormClosingEventArgs(CloseReason.ApplicationExitCall, false));
} }
break;
} }
else if (m.Msg == ScpDevice.WM_DEVICECHANGE) case ScpDevice.WM_DEVICECHANGE:
{ {
if (runHotPlug) if (runHotPlug)
{ {
@ -1073,10 +1077,20 @@ Properties.Resources.DS4Update, MessageBoxButtons.YesNo, MessageBoxIcon.Question
} }
} }
} }
break;
} }
case WM_CLOSE:
if (m.Msg == WM_QUERYENDSESSION) {
ScpDevice.UnregisterNotify(Handle);
break;
}
case WM_QUERYENDSESSION:
{
systemShutdown = true; systemShutdown = true;
break;
}
default: break;
}
// If this is WM_QUERYENDSESSION, the closing event should be // If this is WM_QUERYENDSESSION, the closing event should be
// raised in the base WndProc. // raised in the base WndProc.