summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjacob1 <jfu614@gmail.com>2013-01-26 03:57:51 (GMT)
committer jacob1 <jfu614@gmail.com>2013-01-26 03:57:51 (GMT)
commit1d97f1c9853960ba99a8808263cc6443d9d09ef1 (patch)
tree3c22e0aca0771bcc283e1dd2cabf755794f6e84f
parent4f59211ba8ec4e41262554f6611b971748cdb73f (diff)
downloadpowder-1d97f1c9853960ba99a8808263cc6443d9d09ef1.zip
powder-1d97f1c9853960ba99a8808263cc6443d9d09ef1.tar.gz
typing '~' doesn't close the lua console
-rw-r--r--.gitignore2
-rw-r--r--src/console/ConsoleView.cpp5
2 files changed, 6 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index c7fe9f4..9ac6e38 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 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: