diff options
Diffstat (limited to 'src/client/cl_ui.c')
| -rw-r--r-- | src/client/cl_ui.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/client/cl_ui.c b/src/client/cl_ui.c index 6a4bb16f..8aa4550f 100644 --- a/src/client/cl_ui.c +++ b/src/client/cl_ui.c @@ -853,7 +853,8 @@ intptr_t CL_UISystemCalls( intptr_t *args ) { return Key_GetCatcher(); case UI_KEY_SETCATCHER: - Key_SetCatcher( args[1] ); + // Don't allow the ui module to close the console + Key_SetCatcher( args[1] | ( Key_GetCatcher( ) & KEYCATCH_CONSOLE ) ); return 0; case UI_GETCLIPBOARDDATA: @@ -1032,7 +1033,7 @@ CL_ShutdownUI ==================== */ void CL_ShutdownUI( void ) { - cls.keyCatchers &= ~KEYCATCH_UI; + Key_SetCatcher( Key_GetCatcher( ) & ~KEYCATCH_UI ); cls.uiStarted = qfalse; if ( !uivm ) { return; |