diff options
| author | oy <tom_adams@web.de> | 2023-06-16 18:57:57 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-16 18:57:57 +0200 |
| commit | 834b57e56549d904b6e7ee44426c5d15bab86664 (patch) | |
| tree | 936d36f6085dbe53c0f9cb38b7f41f3775f6cdee | |
| parent | ef9169d2323007d58d027af69eca76a7c7db14be (diff) | |
| parent | f104bd0f2e961fde5e9030b22d6457e69d930865 (diff) | |
Merge pull request #3094 from Robyt3/dbg_console_hide
Extract dbg_console_hide to hide console window (on windows):
| -rw-r--r-- | src/base/system.c | 5 | ||||
| -rw-r--r-- | src/base/system.h | 1 | ||||
| -rw-r--r-- | src/engine/client/client.cpp | 7 | ||||
| -rw-r--r-- | src/engine/server/server.cpp | 7 |
4 files changed, 8 insertions, 12 deletions
diff --git a/src/base/system.c b/src/base/system.c index 1db073eee..75a0d0107 100644 --- a/src/base/system.c +++ b/src/base/system.c @@ -281,6 +281,11 @@ void dbg_console_cleanup() { SetConsoleMode(GetStdHandle(STD_INPUT_HANDLE), old_console_mode); } + +void dbg_console_hide() +{ + FreeConsole(); +} #endif /* */ diff --git a/src/base/system.h b/src/base/system.h index d48bacdc7..3b319b383 100644 --- a/src/base/system.h +++ b/src/base/system.h @@ -1598,6 +1598,7 @@ void dbg_logger_filehandle(IOHANDLE handle); #if defined(CONF_FAMILY_WINDOWS) void dbg_console_init(); void dbg_console_cleanup(); +void dbg_console_hide(); #endif typedef struct diff --git a/src/engine/client/client.cpp b/src/engine/client/client.cpp index 898cc4af6..7909649fd 100644 --- a/src/engine/client/client.cpp +++ b/src/engine/client/client.cpp @@ -44,11 +44,6 @@ #include "serverbrowser.h" #include "client.h" -#if defined(CONF_FAMILY_WINDOWS) - #define WIN32_LEAN_AND_MEAN - #include <windows.h> -#endif - #include "SDL.h" #ifdef main #undef main @@ -2703,7 +2698,7 @@ int main(int argc, const char **argv) // ignore_convention #endif { HideConsole = true; - FreeConsole(); + dbg_console_hide(); } else if(!QuickEditMode) dbg_console_init(); diff --git a/src/engine/server/server.cpp b/src/engine/server/server.cpp index 79f8306e0..4ec12f44f 100644 --- a/src/engine/server/server.cpp +++ b/src/engine/server/server.cpp @@ -30,11 +30,6 @@ #include "register.h" #include "server.h" -#if defined(CONF_FAMILY_WINDOWS) - #define WIN32_LEAN_AND_MEAN - #include <windows.h> -#endif - #include <signal.h> volatile sig_atomic_t InterruptSignaled = 0; @@ -1850,7 +1845,7 @@ int main(int argc, const char **argv) // ignore_convention { if(str_comp("-s", argv[i]) == 0 || str_comp("--silent", argv[i]) == 0) // ignore_convention { - ShowWindow(GetConsoleWindow(), SW_HIDE); + dbg_console_hide(); break; } } |