diff options
| author | Markus Mittendrein <git@maxmitti.tk> | 2016-05-14 22:02:08 +0200 |
|---|---|---|
| committer | Markus Mittendrein <git@maxmitti.tk> | 2016-05-14 22:02:08 +0200 |
| commit | 99db56cafde179c06c1b3fafacbfed9f87508348 (patch) | |
| tree | e17b5543f3585258218a3d969baaddafde3acb22 /src | |
| parent | ec3cf46cec1e2f556d201fccad808dbdd2c84f66 (diff) | |
| download | manager-99db56cafde179c06c1b3fafacbfed9f87508348.tar.gz manager-99db56cafde179c06c1b3fafacbfed9f87508348.zip | |
Move check of empty Config.IRC.IngameChannel to applyConfig
Diffstat (limited to 'src')
| -rw-r--r-- | src/crsm.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/crsm.cpp b/src/crsm.cpp index 6649416..8488aba 100644 --- a/src/crsm.cpp +++ b/src/crsm.cpp @@ -478,7 +478,7 @@ void CRSM::ircConnected() Q_ASSERT(conn == connection); connection->sendCommand(IrcCommand::createMode(connection->nickName(), "+B")); connection->sendCommand(IrcCommand::createJoin(Config.IRC.Channel)); - if(Config.IRC.UseIngameChat && !Config.IRC.IngameChannel.isEmpty()) + if(Config.IRC.UseIngameChat) { connection->sendCommand(IrcCommand::createJoin(Config.IRC.IngameChannel)); ircSetIngameChannelTopic(); @@ -1124,7 +1124,7 @@ void CRSM::stopAliasWishEditing() QString CRSM::ircActivateIngameChat(bool activated) { - if(Config.IRC.UseIngameChat && !Config.IRC.IngameChannel.isEmpty()) + if(Config.IRC.UseIngameChat) { Session.IRC.UseIngameChat = activated; ircSetIngameChannelTopic(); @@ -1186,7 +1186,7 @@ QStringList CRSM::listC4Folder(const QString &path) void CRSM::ircSetIngameChannelTopic() { - if(Config.IRC.UseIngameChat && !Config.IRC.IngameChannel.isEmpty()) + if(Config.IRC.UseIngameChat) { if(Session.State == CRSMSession::None) { @@ -1756,6 +1756,10 @@ void CRSM::applyConfig() if(Config.IRC.Use) { + if(Config.IRC.IngameChannel.isEmpty()) + { + Config.IRC.UseIngameChat = false; + } if(connection == nullptr) { prepareAndConnectIrc(); |