summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjörn Steinbrink <B.Steinbrink@gmx.de>2005-07-26 20:14:45 +0000
committerBjörn Steinbrink <B.Steinbrink@gmx.de>2005-07-26 20:14:45 +0000
commit34e18a818a7696629515c39b920ba35b64832748 (patch)
tree178503733a7cae78f12c51111b2d1fa9fce91180
parent1c43b2cdee5a5508a6e771b477100517deae07e7 (diff)
downloadMana-34e18a818a7696629515c39b920ba35b64832748.tar.gz
Mana-34e18a818a7696629515c39b920ba35b64832748.tar.bz2
Mana-34e18a818a7696629515c39b920ba35b64832748.tar.xz
Mana-34e18a818a7696629515c39b920ba35b64832748.zip
Fixed empty popup window being shown when user right clicks on an empty tile while popup is visible.
-rw-r--r--ChangeLog2
-rw-r--r--src/gui/popupmenu.cpp2
2 files changed, 4 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 94239775..6ea70824 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,8 @@
function.
* src/being.cpp: Set font back to gui font after drawing speech.
Draw auto-target marker in engine instead of being.
+ * src/gui/popupmenu.cpp: Fixed empty popup window being shown when user
+ right clicks on an empty tile while the popup is visible.
2005-07-26 Eugenio Favalli <elvenprogrammer@gmail.com>
diff --git a/src/gui/popupmenu.cpp b/src/gui/popupmenu.cpp
index 18f90af5..32690bdb 100644
--- a/src/gui/popupmenu.cpp
+++ b/src/gui/popupmenu.cpp
@@ -105,6 +105,8 @@ void PopupMenu::showPopup(int mx, int my)
else
{
// If there is nothing of interest, don't display menu.
+ // Hide it, because it may have been visible.
+ setVisible(false);
return;
}