X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fuisupport%2Fuistyle.cpp;h=b95a53047c79b36dc9b25110928669125439c3f5;hb=9861cef46e8a052140070b4c643092f9c62aa6df;hp=7482b93fb7a1ab6c8ac25db8187c6d71d69ef126;hpb=8014a388858e3f0cdc468898efa96cb192bb66a1;p=quassel.git

diff --git a/src/uisupport/uistyle.cpp b/src/uisupport/uistyle.cpp
index 7482b93f..b95a5304 100644
--- a/src/uisupport/uistyle.cpp
+++ b/src/uisupport/uistyle.cpp
@@ -20,7 +20,7 @@
 #include <QApplication>
 
 #include "uistyle.h"
-#include "uistylesettings.h"
+#include "uisettings.h"
 #include "util.h"
 
 // FIXME remove with migration code
@@ -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
@@ -314,6 +317,7 @@ UiStyle::StyledMessage UiStyle::styleMessage(const Message &msg) {
   QString nick = nickFromMask(msg.sender());
   QString txt = mircToInternal(msg.contents());
   QString bufferName = msg.bufferInfo().bufferName();
+  bufferName.replace('%', "%%"); // well, you _can_ have a % in a buffername apparently... -_-
 
   StyledMessage result;