From 32335f43a9d2973823ec1dd5476be3270890d8d4 Mon Sep 17 00:00:00 2001 From: Eugenio Favalli Date: Tue, 12 Dec 2006 16:24:50 +0000 Subject: Fixed crash when selecting an item after death --- ChangeLog | 2 ++ src/net/playerhandler.cpp | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/ChangeLog b/ChangeLog index 80e45cb2..d20045a1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,8 @@ * The Mana World.dev, tmw.cbp: Updated project files. * src/gui/updatewindow.cpp, src/gui/updatewindow.h, src/main.cpp: Added Adler32 checksum for updates. + * src/net/playerhandler.cpp: Fixed crash when selecting an item after + death. 2006-12-12 Bjørn Lindeijer diff --git a/src/net/playerhandler.cpp b/src/net/playerhandler.cpp index e83bcce8..b04778f9 100644 --- a/src/net/playerhandler.cpp +++ b/src/net/playerhandler.cpp @@ -32,6 +32,7 @@ #include "../npc.h" #include "../gui/chat.h" +#include "../gui/npclistdialog.h" #include "../gui/ok_dialog.h" #include "../gui/skill.h" @@ -39,6 +40,8 @@ OkDialog *weightNotice = NULL; OkDialog *deathNotice = NULL; +extern NpcListDialog *npcListDialog; + /** * Listener used for handling the overweigth message. */ @@ -64,6 +67,8 @@ namespace { { player_node->revive(); deathNotice = NULL; + npcListDialog->setVisible(false); + current_npc = 0; } } deathListener; } -- cgit v1.2.3-70-g09d2