summaryrefslogtreecommitdiff
path: root/src/gui/focushandler.cpp
diff options
context:
space:
mode:
authorPhilipp Sehmisch <crush@themanaworld.org>2009-02-11 17:02:16 +0100
committerPhilipp Sehmisch <crush@themanaworld.org>2009-02-11 17:02:16 +0100
commitf262dbd28f08001d70416e3cc4e62273d3fee2cd (patch)
tree539cbc8b27edf696120df0ac26531640c323692f /src/gui/focushandler.cpp
parentd68f3fa13297cf4c8d29753e48c684496852ceba (diff)
parent63ac001daa7dfc0735dfefd9c2829c8786b4edaf (diff)
downloadmana-f262dbd28f08001d70416e3cc4e62273d3fee2cd.tar.gz
mana-f262dbd28f08001d70416e3cc4e62273d3fee2cd.tar.bz2
mana-f262dbd28f08001d70416e3cc4e62273d3fee2cd.tar.xz
mana-f262dbd28f08001d70416e3cc4e62273d3fee2cd.zip
Merge branch 'master' of git@gitorious.org:tmw/eathena
Diffstat (limited to 'src/gui/focushandler.cpp')
-rw-r--r--src/gui/focushandler.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/focushandler.cpp b/src/gui/focushandler.cpp
index dd605be6..b9cfd789 100644
--- a/src/gui/focushandler.cpp
+++ b/src/gui/focushandler.cpp
@@ -26,7 +26,7 @@ void FocusHandler::requestModalFocus(gcn::Widget *widget)
/* If there is another widget with modal focus, remove its modal focus
* and put it on the modal widget stack.
*/
- if (mModalFocusedWidget != NULL && mModalFocusedWidget != widget)
+ if (mModalFocusedWidget && mModalFocusedWidget != widget)
{
mModalStack.push_front(mModalFocusedWidget);
mModalFocusedWidget = NULL;