From 3fb3480ef461c7fa2e1f44142f4d37d80d87e087 Mon Sep 17 00:00:00 2001
From: Jared Adams <jaxad0127@gmail.com>
Date: Tue, 19 Jan 2010 16:33:07 +0000
Subject: Fix problems when dying with an NPC dialog open

---
 src/net/ea/playerhandler.cpp | 3 +++
 src/npc.h                    | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

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;
 
diff --git a/src/npc.h b/src/npc.h
index 2544a08b..ac5cb374 100644
--- a/src/npc.h
+++ b/src/npc.h
@@ -54,7 +54,7 @@ class NPC : public Player
         /** We consider NPCs (at least for now) to be one layer-sprites */
         virtual int getNumberOfLayers() const
         { return 1; }
-        
+
         static const bool isTalking();
 
     protected:
-- 
cgit v1.2.3-70-g09d2