From: Manuel Nickschas <sputnick@quassel-irc.org>
Date: Wed, 6 Aug 2008 23:21:38 +0000 (+0200)
Subject: Fix display of chained mIRC color codes
X-Git-Tag: 0.3.0~88
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=f45fafc6d8ec122a7244cef1fdae1cdf16c6a0c7

Fix display of chained mIRC color codes
---

diff --git a/src/uisupport/uistyle.cpp b/src/uisupport/uistyle.cpp
index cbd99c24..627ba5e8 100644
--- a/src/uisupport/uistyle.cpp
+++ b/src/uisupport/uistyle.cpp
@@ -230,10 +230,13 @@ UiStyle::StyledString UiStyle::styleString(const QString &s_) {
         int color = 10 * s[pos+4].digitValue() + s[pos+5].digitValue();
         //TODO: use 99 as transparent color (re mirc color "standard")
         color &= 0x0f;
-        if(s[pos+3] == 'f')
+        if(s[pos+3] == 'f') {
+          curfmt &= 0xf0ffffff;
           curfmt |= (color << 24) | 0x00400000;
-        else
+        } else {
+          curfmt &= 0x0fffffff;
           curfmt |= (color << 28) | 0x00800000;
+        }
         length = 6;
       }
     } else if(s[pos+1] == 'O') { // reset formatting