mirror of
https://git.ryujinx.app/projects/Kenji-NX.git
synced 2026-11-19 09:21:15 +01:00
Work around Escape hotkey race with exit confirmation dialog
This commit is contained in:
1 parent
9fb338395a
commit
c457a2470f
2 files changed
+21
No files matched your search
@@ -1153,6 +1153,24 @@ namespace Ryujinx.Ava
|
|||||||
|
|
||||||
_dialogShown = true;
|
_dialogShown = true;
|
||||||
|
|
||||||
|
// The hard-coded hotkey mapped to exit is Escape, but it's also the same key
|
||||||
|
// that causes the dialog we launch to close (without doing anything). In release
|
||||||
|
// mode, a race is observed that between ShowExitPrompt() appearing on KeyDown
|
||||||
|
// and the ContentDialog we create seeing the key state before KeyUp. Merely waiting
|
||||||
|
// for the key to no longer be pressed appears to be insufficient.
|
||||||
|
// NB: Using _keyboardInterface.IsPressed(Key.Escape) does not currently work.
|
||||||
|
if (OperatingSystem.IsWindows())
|
||||||
|
{
|
||||||
|
while (GetAsyncKeyState(0x1B) != 0)
|
||||||
|
{
|
||||||
|
await Task.Delay(100);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
await Task.Delay(250);
|
||||||
|
}
|
||||||
|
|
||||||
shouldExit = await ContentDialogHelper.CreateStopEmulationDialog();
|
shouldExit = await ContentDialogHelper.CreateStopEmulationDialog();
|
||||||
|
|
||||||
_dialogShown = false;
|
_dialogShown = false;
|
||||||
|
|||||||
@@ -111,5 +111,8 @@ namespace Ryujinx.Ava.UI.Helpers
|
|||||||
|
|
||||||
[LibraryImport("user32.dll", SetLastError = true)]
|
[LibraryImport("user32.dll", SetLastError = true)]
|
||||||
public static partial IntPtr SetWindowLongPtrW(IntPtr hWnd, int nIndex, IntPtr value);
|
public static partial IntPtr SetWindowLongPtrW(IntPtr hWnd, int nIndex, IntPtr value);
|
||||||
|
|
||||||
|
[LibraryImport("user32.dll", SetLastError = true)]
|
||||||
|
public static partial ushort GetAsyncKeyState(int nVirtKey);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Reference in new issue
Block a user