diff options
| author | Anthony <Helios747@users.noreply.github.com> | 2017-11-27 13:30:33 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-27 13:30:33 -0800 |
| commit | 7c96e51bc89b43c8df3a1e14839894cd04fea2b4 (patch) | |
| tree | 8cd086d1dc454a2535e64e1e0aff4b15c48ef462 /Source/Core/DolphinNoGUI/MainNoGUI.cpp | |
| parent | 9fe5dd7fa9996989b124b5f1a8d2190a689384ad (diff) | |
| parent | 3b2b2de1597e7565623cd78ef30dddf0b45ac053 (diff) | |
Merge pull request #6187 from raelgc/1-exit-on-esc
Add an exit key to `dolphin-emu-nogui`
Diffstat (limited to 'Source/Core/DolphinNoGUI/MainNoGUI.cpp')
| -rw-r--r-- | Source/Core/DolphinNoGUI/MainNoGUI.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Source/Core/DolphinNoGUI/MainNoGUI.cpp b/Source/Core/DolphinNoGUI/MainNoGUI.cpp index 5619689abc..9582facf2d 100644 --- a/Source/Core/DolphinNoGUI/MainNoGUI.cpp +++ b/Source/Core/DolphinNoGUI/MainNoGUI.cpp @@ -241,6 +241,10 @@ class PlatformX11 : public Platform key = XLookupKeysym((XKeyEvent*)&event, 0); if (key == XK_Escape) { + s_shutdown_requested.Set(); + } + else if (key == XK_F10) + { if (Core::GetState() == Core::State::Running) { if (SConfig::GetInstance().bHideCursor) |