summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChuck Miller <shadowmil@gmail.com>2010-03-19 19:39:04 -0400
committerChuck Miller <shadowmil@gmail.com>2010-03-19 19:39:04 -0400
commit4d5e76d4be588397053702b11c70901453bd8fd9 (patch)
tree04f731ad69a83e08c885bd054df8dc28da9285a9
parent1e10007acead0ffc7e784e35f8f559b5cf64ab28 (diff)
downloadmana-4d5e76d4be588397053702b11c70901453bd8fd9.tar.gz
mana-4d5e76d4be588397053702b11c70901453bd8fd9.tar.bz2
mana-4d5e76d4be588397053702b11c70901453bd8fd9.tar.xz
mana-4d5e76d4be588397053702b11c70901453bd8fd9.zip
Fix crash when player chooses to follow a being that has been deleted already
Reviewed-By: Jarad Adams
-rw-r--r--src/gui/popupmenu.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/popupmenu.cpp b/src/gui/popupmenu.cpp
index 7e4bfd65..9052e9d2 100644
--- a/src/gui/popupmenu.cpp
+++ b/src/gui/popupmenu.cpp
@@ -261,9 +261,9 @@ void PopupMenu::handleLink(const std::string &link)
{
player_node->inviteToGuild(being);
}
-
+
// Follow Player action
- else if (link == "follow")
+ else if (link == "follow" && being)
{
player_node->setFollow(being->getName());
}