diff options
| author | Zaba999 <qrwfw5rp> | 2012-10-11 23:10:07 +0200 |
|---|---|---|
| committer | Zaba999 <qrwfw5rp> | 2012-10-11 23:10:07 +0200 |
| commit | 7575ffd49b76aaf4b054c0ca8cb8369fb12c11c9 (patch) | |
| tree | 10915bce6a98c2b0848421dbb79b36ce52bb045b /src/ui/studio.cpp | |
| parent | 8a932fed3e5700af283017deab3cb1da11cb0dce (diff) | |
| parent | dfe21c5a9c2ebf3df0f445014588bcce0387d699 (diff) | |
| download | colobot-7575ffd49b76aaf4b054c0ca8cb8369fb12c11c9.tar.gz colobot-7575ffd49b76aaf4b054c0ca8cb8369fb12c11c9.tar.bz2 colobot-7575ffd49b76aaf4b054c0ca8cb8369fb12c11c9.zip | |
Merge branch 'dev' of https://github.com/colobot/colobot into dev
Diffstat (limited to 'src/ui/studio.cpp')
| -rw-r--r-- | src/ui/studio.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/ui/studio.cpp b/src/ui/studio.cpp index a581baa..2f58c95 100644 --- a/src/ui/studio.cpp +++ b/src/ui/studio.cpp @@ -241,8 +241,8 @@ bool CStudio::EventProcess(const Event &event) if ( event.type == EVENT_KEY_DOWN ) { - if ( event.key.key == m_main->GetInputBinding(INPUT_SLOT_CBOT).key || - event.key.key == m_main->GetInputBinding(INPUT_SLOT_CBOT).joy ) + if ( event.key.key == m_main->GetInputBinding(INPUT_SLOT_CBOT).primary || + event.key.key == m_main->GetInputBinding(INPUT_SLOT_CBOT).secondary ) { if ( m_helpFilename.length() > 0 ) { |