Merge branch 'master' into fixShipConnections

Author: Flamefire

extras/videoDrivers/SDL2/VideoSDL2.cpp

@@ -339,19 +339,15 @@ bool VideoSDL2::MessageLoop()
             case SDL_QUIT: return false;
             case SDL_WINDOWEVENT:
             {
-                switch(ev.window.event)
+                if(ev.window.event == SDL_WINDOWEVENT_RESIZED)
                 {
-                    case SDL_WINDOWEVENT_RESIZED:
+                    UpdateCurrentDisplayMode();
+                    VideoMode newSize(ev.window.data1, ev.window.data2);
+                    if(newSize != GetWindowSize())
                     {
-                        UpdateCurrentDisplayMode();
-                        VideoMode newSize(ev.window.data1, ev.window.data2);
-                        if(newSize != GetWindowSize())
-                        {
-                            UpdateCurrentSizes();
-                            CallBack->WindowResized();
-                        }
+                        UpdateCurrentSizes();
+                        CallBack->WindowResized();
                     }
-                    break;
                 }
             }
             break;

libs/s25client/s25client.cpp

@@ -88,7 +88,7 @@ void WaitForEnter()
     if(waited)
         return;
     waited = true;
-    bnw::cout << "\n\nPress ENTER to close this window . . ." << std::endl;
+    bnw::cerr << "\n\nPress ENTER to close this window . . .\n";
     bnw::cin.clear();
     bnw::cin.ignore(std::numeric_limits<std::streamsize>::max(), '\n');
     bnw::cin.get();
@@ -244,39 +244,12 @@ void InstallSignalHandlers()
 #endif // _MSC_VER
 }
 
-void UninstallSignalHandlers()
-{
-#ifdef _WIN32
-    SetConsoleCtrlHandler(ConsoleSignalHandler, FALSE);
-#else
-    struct sigaction sa;
-    sa.sa_handler = SIG_DFL;
-    sa.sa_flags = 0; // SA_RESTART would not allow to interrupt connect call;
-    sigemptyset(&sa.sa_mask);
-
-    sigaction(SIGINT, &sa, nullptr);
-    sigaction(SIGPIPE, &sa, nullptr);
-    sigaction(SIGALRM, &sa, nullptr);
-#endif // _WIN32
-
-#ifdef _MSC_VER
-    SetUnhandledExceptionFilter(nullptr);
-#else
-    signal(SIGSEGV, SIG_DFL);
-#endif
-}
-
 /**
  *  Exit-Handler, wird bei @p exit ausgeführt.
  */
 void ExitHandler()
 {
     Socket::Shutdown();
-    UninstallSignalHandlers();
-
-#ifdef _DEBUG
-    WaitForEnter();
-#endif
 }
 
 void SetAppSymbol()

libs/s25main/SignalHandler.cpp

@@ -37,9 +37,9 @@ void ConsoleSignalHandler(int sig)
     if(sig == SIGINT)
     {
         if(!killme)
-            boost::nowide::cout << "Do you really want to terminate the program (y/n) : " << std::flush;
+            boost::nowide::cerr << "Do you really want to terminate the program (y/n) : ";
         else
-            boost::nowide::cout << "Do you really want to kill the program (y/n) : " << std::flush;
+            boost::nowide::cerr << "Do you really want to kill the program (y/n) : ";
 
         int c = getchar();
         if(c == 'j' || c == 'y' || c == 1079565930)