Fix that sometimes % wasn't escaped properly, triggering an assert

in the style engine.

diff --git a/src/common/message.cpp b/src/common/message.cpp
index 371867d..3a8dbc6 100644 (file)
--- a/src/common/message.cpp
+++ b/src/common/message.cpp
@@ -149,21 +149,21 @@ void Message::format() {
     break;
     case Message::Nick:
       s = tr("%Dr<->");
     break;
     case Message::Nick:
       s = tr("%Dr<->");

-      if(nick == text()) t = tr("%DrYou are now known as %DN%1%DN").arg(text());
-      else t = tr("%Dr%DN%1%DN is now known as %DN%DU%2%DU%DN").arg(nick, text());
+      if(nick == text()) t = tr("%DrYou are now known as %DN%1%DN").arg(txt);
+      else t = tr("%Dr%DN%1%DN is now known as %DN%DU%2%DU%DN").arg(nick, txt);

       break;
     case Message::Mode:
       s = tr("%Dm***");
       if(nick.isEmpty()) t = tr("%DmUser mode: %DM%1%DM").arg(text());
       break;
     case Message::Mode:
       s = tr("%Dm***");
       if(nick.isEmpty()) t = tr("%DmUser mode: %DM%1%DM").arg(text());

-      else t = tr("%DmMode %DM%1%DM by %DN%DU%2%DU%DN").arg(text(), nick);
+      else t = tr("%DmMode %DM%1%DM by %DN%DU%2%DU%DN").arg(txt, nick);

       break;
     case Message::Action:
       s = tr("%Da-*-");
       break;
     case Message::Action:
       s = tr("%Da-*-");

-      t = tr("%Da%DN%DU%1%DU%DN %2").arg(nick).arg(text());
+      t = tr("%Da%DN%DU%1%DU%DN %2").arg(nick).arg(txt);

       break;
     default:
       s = tr("%De%1").arg(sender());
       break;
     default:
       s = tr("%De%1").arg(sender());

-      t = tr("%De[%1]").arg(text());
+      t = tr("%De[%1]").arg(txt);

   }
   _formattedSender = s;
   _formattedText = t;
   }
   _formattedSender = s;
   _formattedText = t;

diff --git a/src/uisupport/uistyle.cpp b/src/uisupport/uistyle.cpp
index 505fbc2..84a4099 100644 (file)
--- a/src/uisupport/uistyle.cpp
+++ b/src/uisupport/uistyle.cpp
@@ -169,7 +169,11 @@ UiStyle::StyledText UiStyle::styleString(QString s) {
       QString code = QString("%") + s[pos+1];
       if(s[pos+1] == 'D') code += s[pos+2];
       FormatType ftype = formatType(code);
       QString code = QString("%") + s[pos+1];
       if(s[pos+1] == 'D') code += s[pos+2];
       FormatType ftype = formatType(code);

-      Q_ASSERT(ftype != Invalid);
+      if(ftype == Invalid) {
+        qWarning(qPrintable(QString("Invalid format code in string: %1").arg(s)));
+        continue;
+      }
+      //Q_ASSERT(ftype != Invalid);

       length = code.length();
       if(!fmtList.contains(ftype)) {
         // toggle it on
       length = code.length();
       if(!fmtList.contains(ftype)) {
         // toggle it on