From 6bd4fff31e0b44b8b71876250c626fe8c15b4105 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Mon, 12 Sep 2011 18:29:12 +0300
Subject: Add missing checks to some files and style fixes.

---
 src/guildmanager.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/guildmanager.cpp')

diff --git a/src/guildmanager.cpp b/src/guildmanager.cpp
index c5d8f8bb6..4620de742 100644
--- a/src/guildmanager.cpp
+++ b/src/guildmanager.cpp
@@ -96,7 +96,7 @@ void GuildManager::reload()
     if (socialWindow)
     {
         Guild *guild = Guild::getGuild(1);
-        if (guild)
+        if (guild && socialWindow)
             socialWindow->removeTab(guild);
     }
     delete mTab;
@@ -120,7 +120,8 @@ void GuildManager::chat(std::string msg)
 void GuildManager::getNames(std::vector<std::string> &names)
 {
     Guild *guild = createGuild();
-    guild->getNames(names);
+    if (guild)
+        guild->getNames(names);
 }
 
 void GuildManager::requestGuildInfo()
-- 
cgit v1.2.3-60-g2f50