Don't handle Alt+F4 from UInputMan - different event dispatched when multiple windows exist (followup to 0611feb)

Author: MaximDude

Main.cpp

@@ -165,8 +165,12 @@ namespace RTE {
 			switch (sdlEvent.type) {
 				case SDL_QUIT:
 					System::SetQuit(true);
-					break;
+					return;
 				case SDL_WINDOWEVENT:
+					if (sdlEvent.window.event == SDL_WINDOWEVENT_CLOSE) {
+						System::SetQuit(true);
+						return;
+					}
 					g_WindowMan.HandleWindowEvent(sdlEvent);
 					break;
 				case SDL_KEYUP:

Managers/UInputMan.cpp

@@ -922,9 +922,6 @@ namespace RTE {
 		} else if (!FlagCtrlState() && FlagAltState()) {
 			if (KeyPressed(SDLK_F2)) {
 				ContentFile::ReloadAllBitmaps();
-			} else if (KeyPressed(SDLK_F4)) {
-				// Alt+F4 OS event doesn't seem to work when in multi-display fullscreen, probably because multiple windows, so just handle it here all the time.
-				System::SetQuit();
 			// Alt+Enter to switch resolution multiplier
 			} else if (KeyPressed(SDLK_RETURN)) {
 				g_WindowMan.ChangeResolutionMultiplier();