summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMarkus Mittendrein <git@maxmitti.tk>2015-09-24 14:06:35 +0200
committerMarkus Mittendrein <git@maxmitti.tk>2015-09-24 14:06:35 +0200
commit02421a222ba2cd1c4bf4aea8bf82ad5558618670 (patch)
tree3c7b48a7bf26b4d1bde6f424fadeba15dfdbdca2 /src
parentd21b8fe598eb98cf3ecac784a4d8be31828408a1 (diff)
downloadmanager-02421a222ba2cd1c4bf4aea8bf82ad5558618670.tar.gz
manager-02421a222ba2cd1c4bf4aea8bf82ad5558618670.zip
Fix [IRC] Nick overriding [Network] Nick when reading the clonk config
Diffstat (limited to 'src')
-rw-r--r--src/crsm.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/crsm.cpp b/src/crsm.cpp
index 3e3ca1e..1ff450f 100644
--- a/src/crsm.cpp
+++ b/src/crsm.cpp
@@ -719,6 +719,7 @@ void CRSM::readConfig()
static QRegExp pcNameExp(R"_(^\s*LocalName="(.*)"\s*$)_");
foreach(const QString &line, QString(clonkConfig.readAll().trimmed()).split("\n"))
{
+ if(!Config.Auto.Volatile.Clonk.ServerNick.isEmpty() && !Config.Auto.Volatile.Clonk.ServerPCName.isEmpty()) break;
if(nickExp.exactMatch(line.trimmed()))
{
Config.Auto.Volatile.Clonk.ServerNick = nickExp.cap(1);