diff options
| author | Andrei Karas <akaras@inbox.ru> | 2011-09-12 18:29:12 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2011-09-13 04:41:55 +0300 |
| commit | 6bd4fff31e0b44b8b71876250c626fe8c15b4105 (patch) | |
| tree | cdd7f984a0850864316ae23c33120b6d282b70ba /src/guildmanager.cpp | |
| parent | f457675ecfd704c99e84fe14f0a1dd49a69a9c76 (diff) | |
| download | manaplus-6bd4fff31e0b44b8b71876250c626fe8c15b4105.tar.gz manaplus-6bd4fff31e0b44b8b71876250c626fe8c15b4105.tar.bz2 manaplus-6bd4fff31e0b44b8b71876250c626fe8c15b4105.tar.xz manaplus-6bd4fff31e0b44b8b71876250c626fe8c15b4105.zip | |
Add missing checks to some files and style fixes.
Diffstat (limited to 'src/guildmanager.cpp')
| -rw-r--r-- | src/guildmanager.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
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() |