From: Manuel Nickschas <sputnick@quassel-irc.org>
Date: Wed, 22 Jul 2009 23:13:51 +0000 (+0200)
Subject: Merge rather than replace identical sections in QSS
X-Git-Tag: 0.5-rc1~125
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=0edcf393c9aaab06f7db904bea1da0b7352f1ed7

Merge rather than replace identical sections in QSS
---

diff --git a/src/uisupport/qssparser.cpp b/src/uisupport/qssparser.cpp
index 8e917b7b..c6b69d9e 100644
--- a/src/uisupport/qssparser.cpp
+++ b/src/uisupport/qssparser.cpp
@@ -127,7 +127,7 @@ void QssParser::parseChatLineData(const QString &decl, const QString &contents)
     }
   }
 
-  _formats[fmtType] = format;
+  _formats[fmtType].merge(format);
 }
 
 quint64 QssParser::parseFormatType(const QString &decl) {