From 04de729d7c845e57c957aa1ea4fd91129b407d68 Mon Sep 17 00:00:00 2001 From: Anonymous275 Date: Tue, 17 Nov 2020 08:28:02 +0200 Subject: [PATCH] console setup errors will no longer deny a server startup --- src/Console.cpp | 17 +++++++---------- src/Init/Startup.cpp | 2 +- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/src/Console.cpp b/src/Console.cpp index 838726d..e399331 100644 --- a/src/Console.cpp +++ b/src/Console.cpp @@ -99,25 +99,22 @@ char _getch(void) { #endif // WIN32 void SetupConsole() { -#if defined(WIN32) && !defined(DEBUG) +#if defined(WIN32) DWORD outMode = 0; HANDLE stdoutHandle = GetStdHandle(STD_OUTPUT_HANDLE); if (stdoutHandle == INVALID_HANDLE_VALUE) { - error("Invalid handle"); - std::this_thread::sleep_for(std::chrono::seconds(3)); - _Exit(GetLastError()); + error("Invalid console handle! Inputs will not work properly"); + return; } if (!GetConsoleMode(stdoutHandle, &outMode)) { - error("Invalid console mode"); - std::this_thread::sleep_for(std::chrono::seconds(3)); - _Exit(GetLastError()); + error("Invalid console mode! Inputs will not work properly"); + return; } // Enable ANSI escape codes outMode |= ENABLE_VIRTUAL_TERMINAL_PROCESSING; if (!SetConsoleMode(stdoutHandle, outMode)) { - error("failed to set console mode"); - std::this_thread::sleep_for(std::chrono::seconds(3)); - _Exit(GetLastError()); + error("failed to set console mode! Inputs will not work properly"); + return; } #else #endif // WIN32 diff --git a/src/Init/Startup.cpp b/src/Init/Startup.cpp index cca51d7..30936b7 100644 --- a/src/Init/Startup.cpp +++ b/src/Init/Startup.cpp @@ -9,7 +9,7 @@ std::string CustomIP; std::string GetSVer() { - return std::string(Sec("1.11")); + return std::string(Sec("1.12")); } std::string GetCVer() { return std::string(Sec("1.70"));