diff options
| author | Simon Robertshaw <simon@hardwired.org.uk> | 2013-01-26 17:15:02 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2013-01-26 17:15:02 (GMT) |
| commit | 8e689fdd080ff24b9beb68852ff9b7c74594f119 (patch) | |
| tree | 0260bce01d5e49427c6cfc364845b1f9e8c0c1d4 /src/console | |
| parent | 3e60181dbe8fe291c27f909738a8210111557665 (diff) | |
| parent | 46b767da0c14745a6cd807637249ec0b5b57b8f1 (diff) | |
| download | powder-8e689fdd080ff24b9beb68852ff9b7c74594f119.zip powder-8e689fdd080ff24b9beb68852ff9b7c74594f119.tar.gz | |
Merge branch 'master' of github.com:FacialTurd/The-Powder-Toy
Diffstat (limited to 'src/console')
| -rw-r--r-- | src/console/ConsoleView.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/console/ConsoleView.cpp b/src/console/ConsoleView.cpp index 67c83de..5390cbd 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: |