From 99ecd9ba734a308ae374d4494856d8bb3617f8a0 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Tue, 12 Apr 2016 23:50:57 +0300
Subject: Fix "invite to guild" from context menu.

---
 src/actions/chat.cpp | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

(limited to 'src/actions')

diff --git a/src/actions/chat.cpp b/src/actions/chat.cpp
index 25ddb4e92..f8cb0731d 100644
--- a/src/actions/chat.cpp
+++ b/src/actions/chat.cpp
@@ -385,7 +385,7 @@ impHandler(party)
 
 impHandler(guild)
 {
-    if (!guildHandler || !event.tab || !localPlayer)
+    if (!guildHandler || !localPlayer)
         return false;
 
     const std::string args = event.args;
@@ -406,9 +406,18 @@ impHandler(guild)
     }
     else
     {
-        // TRANSLATORS: guild invite message
-        event.tab->chatLog(_("Please specify a name."),
-            ChatMsgType::BY_SERVER);
+        if (event.tab)
+        {
+            // TRANSLATORS: guild invite message
+            event.tab->chatLog(_("Please specify a name."),
+                ChatMsgType::BY_SERVER);
+        }
+        else if (localChatTab)
+        {
+            // TRANSLATORS: guild invite message
+            localChatTab->chatLog(_("Please specify a name."),
+                ChatMsgType::BY_SERVER);
+        }
     }
     return true;
 }
-- 
cgit v1.2.3-60-g2f50