Max/kichikuou_system3-sdl2
1
0
Fork 0
mirror of https://github.com/kichikuou/system3-sdl2.git synced 2026-09-22 22:58:12 +03:00
Code Issues Packages Projects Releases Wiki Activity

Windows: Do not allocate a console if stdout is usable

Browse Source 
init_console() unconditionally reopened stdout, stderr and stdin on a
newly allocated console. Since ad33e72 this also happens for
`-texthook print`, which made the scenario tests fail because ctest
could no longer read the output of the process.
This commit is contained in:
kichikuou
2026-09-02 17:12:05 +09:00
parent 783584d176
commit 4c9aee4e67
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/win/nact_win.cpp
+10 -4
View File
@@ -39,8 +39,16 @@ void init_menu(bool mouse_move_enabled, const Config& config)
CheckMenuItem(hmenu, ID_TEXT_AUTO_COPY, MF_BYCOMMAND | MFS_CHECKED);
}
void init_console(int sys_ver)
void init_console(const Config& config, int sys_ver)
{
if (config.debugger_mode == DebuggerMode::DAP)
return;
if (config.debugger_mode != DebuggerMode::CLI && !config.trace &&
config.texthook_mode != TexthookMode::PRINT)
return;
// GetFileType() rejects the unusable handles a GUI program inherits.
if (GetFileType(GetStdHandle(STD_OUTPUT_HANDLE)) != FILE_TYPE_UNKNOWN)
return;
AllocConsole();
freopen("CONOUT$", "w", stdout);
freopen("CONOUT$", "w", stderr);
@@ -137,9 +145,7 @@ void NACT::text_dialog()
void NACT::platform_initialize()
{
init_menu(mouse_move_enabled, config);
if (config.debugger_mode == DebuggerMode::CLI ||
((config.trace || config.texthook_mode == TexthookMode::PRINT) && config.debugger_mode != DebuggerMode::DAP))
init_console(game_id.sys_ver);
init_console(config, game_id.sys_ver);
SDL_EventState(SDL_SYSWMEVENT, SDL_ENABLE);
}