diff options
| author | Andrei Karas <akaras@inbox.ru> | 2012-04-01 22:06:18 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2012-04-01 22:06:18 +0300 |
| commit | 58b20fa29b8f61c333a90fe38ece7a058b910ea6 (patch) | |
| tree | 1bf3a73c30f2b91f9b994da2d628b46066bf7987 /src/inputmanager.cpp | |
| parent | a1d592f55539ad5031d92feb4da049825e986783 (diff) | |
| download | manaplus-58b20fa29b8f61c333a90fe38ece7a058b910ea6.tar.gz manaplus-58b20fa29b8f61c333a90fe38ece7a058b910ea6.tar.bz2 manaplus-58b20fa29b8f61c333a90fe38ece7a058b910ea6.tar.xz manaplus-58b20fa29b8f61c333a90fe38ece7a058b910ea6.zip | |
Fix shortcuts handling in trade window.
Diffstat (limited to 'src/inputmanager.cpp')
| -rw-r--r-- | src/inputmanager.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/inputmanager.cpp b/src/inputmanager.cpp index 46a2265c6..f57a48b30 100644 --- a/src/inputmanager.cpp +++ b/src/inputmanager.cpp @@ -29,6 +29,7 @@ #include "gui/inventorywindow.h" #include "gui/npcdialog.h" #include "gui/setup.h" +#include "gui/tradewindow.h" #include <guichan/focushandler.hpp> @@ -52,7 +53,8 @@ int InputManager::getInputConditionMask() mask += COND_ENABLED; if ((!chatWindow || !chatWindow->isInputFocused()) && !NpcDialog::isAnyInputFocused() && - !InventoryWindow::isAnyInputFocused()) + !InventoryWindow::isAnyInputFocused() && + (!tradeWindow || !tradeWindow->isInpupFocused())) { mask += COND_NOINPUT; } |