diff --git a/.gitignore b/.gitignore index c7fe9f482..9ac6e3872 100644 --- a/.gitignore +++ b/.gitignore @@ -46,6 +46,8 @@ Makefile.me *.project *.cproject *.settings +*.cbp +*.layout config.log *.sconsign.dblite *.sconf_temp diff --git a/src/console/ConsoleView.cpp b/src/console/ConsoleView.cpp index 67c83de33..5390cbde8 100644 --- a/src/console/ConsoleView.cpp +++ b/src/console/ConsoleView.cpp @@ -37,7 +37,10 @@ void ConsoleView::DoKeyPress(int key, Uint16 character, bool shift, bool ctrl, b { case KEY_ESCAPE: case '`': - c->CloseConsole(); + if (character != '~') + c->CloseConsole(); + else + Window::DoKeyPress(key, character, shift, ctrl, alt); break; case KEY_RETURN: case KEY_ENTER: