summaryrefslogtreecommitdiff
path: root/src/net/ea
diff options
context:
space:
mode:
authorJared Adams <jaxad0127@gmail.com>2010-01-19 16:33:07 +0000
committerJared Adams <jaxad0127@gmail.com>2010-01-19 16:33:46 +0000
commit3fb3480ef461c7fa2e1f44142f4d37d80d87e087 (patch)
tree452ae800f9dcfbb4f7e5787aaabf413f8583a274 /src/net/ea
parentb823889f1747bbceb61273f7a7383580c4b034e3 (diff)
downloadMana-3fb3480ef461c7fa2e1f44142f4d37d80d87e087.tar.gz
Mana-3fb3480ef461c7fa2e1f44142f4d37d80d87e087.tar.bz2
Mana-3fb3480ef461c7fa2e1f44142f4d37d80d87e087.tar.xz
Mana-3fb3480ef461c7fa2e1f44142f4d37d80d87e087.zip
Fix problems when dying with an NPC dialog open
Diffstat (limited to 'src/net/ea')
-rw-r--r--src/net/ea/playerhandler.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/net/ea/playerhandler.cpp b/src/net/ea/playerhandler.cpp
index d7b8594e..3a0a2fe2 100644
--- a/src/net/ea/playerhandler.cpp
+++ b/src/net/ea/playerhandler.cpp
@@ -30,6 +30,7 @@
#include "gui/buy.h"
#include "gui/buysell.h"
#include "gui/gui.h"
+#include "gui/npcdialog.h"
#include "gui/okdialog.h"
#include "gui/sell.h"
#include "gui/statuswindow.h"
@@ -87,6 +88,8 @@ namespace {
if (storageWindow->isVisible())
storageWindow->close();
viewport->closePopupMenu();
+ npcDialog->closeDialog();
+ current_npc = 0;
}
} deathListener;