Allow Ctrl + Esc in-game as well

Author: v-rob

README.md

@@ -57,7 +57,7 @@ Some can be changed in the key config dialog in the settings tab.
 | T                             | Chat                                                           |
 | /                             | Command                                                        |
 | Esc                           | Pause menu/abort/exit (pauses only singleplayer game)          |
-| Ctrl + Esc                    | Exit directly to main menu when within GUI                     |
+| Ctrl + Esc                    | Exit directly to main menu from anywhere, bypassing pause menu |
 | +                             | Increase view range                                            |
 | -                             | Decrease view range                                            |
 | K                             | Enable/disable fly mode (needs fly privilege)                  |

src/client/inputhandler.cpp

@@ -148,6 +148,10 @@ bool MyEventReceiver::OnEvent(const SEvent &event)
 			}
 			fullscreen_is_down = event.KeyInput.PressedDown;
 			return true;
+		} else if (keyCode == EscapeKey &&
+				event.KeyInput.PressedDown && event.KeyInput.Control) {
+			g_gamecallback->disconnect();
+			return true;
 		}
 	}
 
@@ -166,6 +170,7 @@ bool MyEventReceiver::OnEvent(const SEvent &event)
 	// Remember whether each key is down or up
 	if (event.EventType == irr::EET_KEY_INPUT_EVENT) {
 		KeyPress keyCode(event.KeyInput);
+
 		if (setKeyDown(keyCode, event.KeyInput.PressedDown))
 			return true;
 	} else if (g_touchcontrols && event.EventType == irr::EET_TOUCH_INPUT_EVENT) {

src/gui/guiFormSpecMenu.cpp

@@ -4025,16 +4025,11 @@ bool GUIFormSpecMenu::OnEvent(const SEvent& event)
 {
 	if (event.EventType==EET_KEY_INPUT_EVENT) {
 		KeyPress kp(event.KeyInput);
-		if (event.KeyInput.PressedDown) {
-			if (kp == EscapeKey && event.KeyInput.Control) {
-				m_text_dst->gotText(L"MenuQuit");
-				g_gamecallback->disconnect();
-				return true;
-			} else if (kp == EscapeKey ||
-					(m_client != nullptr && kp == getKeySetting("keymap_inventory"))) {
-				tryClose();
-				return true;
-			}
+		if (event.KeyInput.PressedDown && (
+				(kp == EscapeKey) ||
+				((m_client != NULL) && (kp == getKeySetting("keymap_inventory"))))) {
+			tryClose();
+			return true;
 		}
 
 		if (m_client != NULL && event.KeyInput.PressedDown &&