From 02421a222ba2cd1c4bf4aea8bf82ad5558618670 Mon Sep 17 00:00:00 2001
From: Markus Mittendrein <git@maxmitti.tk>
Date: Thu, 24 Sep 2015 14:06:35 +0200
Subject: Fix [IRC] Nick overriding [Network] Nick when reading the clonk
 config

---
 src/crsm.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/crsm.cpp')

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);
-- 
cgit v1.2.3-54-g00ecf