diff options
| author | Thorbjørn Lindeijer <thorbjorn.lindeijer@nokia.com> | 2010-12-15 21:20:27 +0100 |
|---|---|---|
| committer | Thorbjørn Lindeijer <thorbjorn.lindeijer@nokia.com> | 2010-12-15 21:20:27 +0100 |
| commit | e78ed334abc80578346dbef8a8b995c99dcfee7b (patch) | |
| tree | 309c015c208ca2a57906df53741750ba90d48ad4 /src/game.cpp | |
| parent | 580bf0a92367c08d10344784843b77cf7fb73d13 (diff) | |
| parent | ed5b9c52d7e469f0966c19ad9876b70aa8ac3737 (diff) | |
| download | mana-e78ed334abc80578346dbef8a8b995c99dcfee7b.tar.gz mana-e78ed334abc80578346dbef8a8b995c99dcfee7b.tar.bz2 mana-e78ed334abc80578346dbef8a8b995c99dcfee7b.tar.xz mana-e78ed334abc80578346dbef8a8b995c99dcfee7b.zip | |
Merge branch '0.5'
Diffstat (limited to 'src/game.cpp')
| -rw-r--r-- | src/game.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/game.cpp b/src/game.cpp index 1eb66572..92005dba 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -448,7 +448,8 @@ void Game::handleInput() && !gui->getFocusHandler()->getModalFocused()) { NpcDialog *dialog = NpcDialog::getActive(); - if (keyboard.isKeyActive(keyboard.KEY_OK)) + if (keyboard.isKeyActive(keyboard.KEY_OK) + && (!dialog || !dialog->isTextInputFocused())) { // Close the Browser if opened if (helpWindow->isVisible()) |