summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-12-08 21:12:33 +0300
committerAndrei Karas <akaras@inbox.ru>2014-12-08 21:12:33 +0300
commit13b08d35c2d96ae734da14ab58d6263287e342c9 (patch)
tree2b6ca9bff7fde317dcc9e65504e96c7237b5a3f3 /src
parent9c1b552de879776dbc963717753913548d6a82d7 (diff)
downloadplus-13b08d35c2d96ae734da14ab58d6263287e342c9.tar.gz
plus-13b08d35c2d96ae734da14ab58d6263287e342c9.tar.bz2
plus-13b08d35c2d96ae734da14ab58d6263287e342c9.tar.xz
plus-13b08d35c2d96ae734da14ab58d6263287e342c9.zip
Not allow move with keyboard if popup menu opened.
Diffstat (limited to 'src')
-rw-r--r--src/game.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/game.cpp b/src/game.cpp
index 5b1c1455e..51d9cab9c 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -59,6 +59,8 @@
#include "gui/fonts/font.h"
+#include "gui/popups/popupmenu.h"
+
#include "gui/windows/bankwindow.h"
#include "gui/windows/botcheckerwindow.h"
#include "gui/windows/chatwindow.h"
@@ -809,7 +811,8 @@ void Game::handleMove()
&& chatWindow
&& !chatWindow->isInputFocused()
&& !InventoryWindow::isAnyInputFocused()
- && !quitDialog)
+ && !quitDialog
+ && !popupMenu->isPopupVisible())
{
NpcDialog *const dialog = NpcDialog::getActive();
if (dialog)