From 6e6fd65992343ca37e92d24efc760666b4485160 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sun, 30 Dec 2012 16:16:09 +0300
Subject: Allow open context menu in textfields before connecting to server.

---
 src/gui/popupmenu.cpp | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

(limited to 'src/gui/popupmenu.cpp')

diff --git a/src/gui/popupmenu.cpp b/src/gui/popupmenu.cpp
index 544bc028c..844fc4e3f 100644
--- a/src/gui/popupmenu.cpp
+++ b/src/gui/popupmenu.cpp
@@ -675,10 +675,9 @@ void PopupMenu::showChangePos(const int x, const int y)
 void PopupMenu::handleLink(const std::string &link,
                            gcn::MouseEvent *event A_UNUSED)
 {
-    if (!actorSpriteManager)
-        return;
-
-    Being *being = actorSpriteManager->findBeing(mBeingId);
+    Being *being = nullptr;
+    if (actorSpriteManager)
+        being = actorSpriteManager->findBeing(mBeingId);
 
     // Talk To action
     if (link == "talk" && being && being->canTalk())
@@ -724,7 +723,8 @@ void PopupMenu::handleLink(const std::string &link,
     }
     else if (link == "heal" && being && being->getType() != Being::MONSTER)
     {
-        actorSpriteManager->heal(being);
+        if (actorSpriteManager)
+            actorSpriteManager->heal(being);
     }
     else if (link == "unignore" && being &&
              being->getType() == ActorSprite::PLAYER)
@@ -813,8 +813,12 @@ void PopupMenu::handleLink(const std::string &link,
     }
     else if (link == "nuke" && being)
     {
-        actorSpriteManager->addBlock(static_cast<uint32_t>(being->getId()));
-        actorSpriteManager->destroy(being);
+        if (actorSpriteManager)
+        {
+            actorSpriteManager->addBlock(static_cast<uint32_t>(
+                being->getId()));
+            actorSpriteManager->destroy(being);
+        }
     }
     // Follow Player action
     else if (link == "follow" && !mNick.empty())
-- 
cgit v1.2.3-60-g2f50