diff options
| author | Andrei Karas <akaras@inbox.ru> | 2011-08-30 01:57:05 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2011-08-30 02:32:13 +0300 |
| commit | 9f752d5431364c052b364045015d3574da2c320c (patch) | |
| tree | 9278797f892129e42fde74656db032dc480c4490 /src/gui | |
| parent | 8158669fde4f4a32191d6b052586e7cf0889ab7e (diff) | |
| download | mv-9f752d5431364c052b364045015d3574da2c320c.tar.gz mv-9f752d5431364c052b364045015d3574da2c320c.tar.bz2 mv-9f752d5431364c052b364045015d3574da2c320c.tar.xz mv-9f752d5431364c052b364045015d3574da2c320c.zip | |
Dont create guild manager instance if guild bot support not enabled.
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/setup_other.cpp | 3 | ||||
| -rw-r--r-- | src/gui/socialwindow.cpp | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/gui/setup_other.cpp b/src/gui/setup_other.cpp index 05ec9d672..1cad4c594 100644 --- a/src/gui/setup_other.cpp +++ b/src/gui/setup_other.cpp @@ -147,6 +147,9 @@ Setup_Other::Setup_Other() new SetupItemLabel(_("Bots support"), "", this); + new SetupItemCheckBox(_("Enable auction bot support"), "", + "enableAuctionBot", this, "enableAuctionBotEvent", false); + new SetupItemCheckBox(_("Enable guild bot support and disable native " "guild support"), "", "enableGuildBot", this, "enableGuildBotEvent", false); diff --git a/src/gui/socialwindow.cpp b/src/gui/socialwindow.cpp index ca52ea283..b9c8cb365 100644 --- a/src/gui/socialwindow.cpp +++ b/src/gui/socialwindow.cpp @@ -1311,7 +1311,7 @@ void SocialWindow::action(const gcn::ActionEvent &event) strprintf(_("Accepted guild invite from %s."), mPartyInviter.c_str())); } - if (!guildManager || !guildManager->getEnableGuildBot()) + if (!guildManager || !GuildManager::getEnableGuildBot()) Net::getGuildHandler()->inviteResponse(mGuildInvited, true); else guildManager->inviteResponse(true); @@ -1324,7 +1324,7 @@ void SocialWindow::action(const gcn::ActionEvent &event) strprintf(_("Rejected guild invite from %s."), mPartyInviter.c_str())); } - if (!guildManager || !guildManager->getEnableGuildBot()) + if (!guildManager || !GuildManager::getEnableGuildBot()) Net::getGuildHandler()->inviteResponse(mGuildInvited, false); else guildManager->inviteResponse(false); |