diff options
| -rw-r--r-- | courtroom.cpp | 55 | ||||
| -rw-r--r-- | path_functions.cpp | 2 |
2 files changed, 29 insertions, 28 deletions
diff --git a/courtroom.cpp b/courtroom.cpp index 2769f77d..9f2f7f7d 100644 --- a/courtroom.cpp +++ b/courtroom.cpp @@ -2055,33 +2055,6 @@ void Courtroom::chat_tick() if (f_character == " ") ui_vp_message->insertPlainText(" "); - else if (m_chatmessage[TEXT_COLOR].toInt() == RAINBOW) - { - QString html_color; - - switch (rainbow_counter) - { - case 0: - html_color = get_text_color(QString::number(RED)).name(); - break; - case 1: - html_color = get_text_color(QString::number(ORANGE)).name(); - break; - case 2: - html_color = get_text_color(QString::number(YELLOW)).name(); - break; - case 3: - html_color = get_text_color(QString::number(GREEN)).name(); - break; - default: - html_color = get_text_color(QString::number(BLUE)).name(); - rainbow_counter = -1; - } - - ++rainbow_counter; - - ui_vp_message->insertHtml("<font color=\"" + html_color + "\">" + f_character + "</font>"); - } // Escape character. else if (f_character == "\\" and !next_character_is_not_special) @@ -2245,6 +2218,34 @@ void Courtroom::chat_tick() } else { + if (m_chatmessage[TEXT_COLOR].toInt() == RAINBOW) + { + QString html_color; + + switch (rainbow_counter) + { + case 0: + html_color = get_text_color(QString::number(RED)).name(); + break; + case 1: + html_color = get_text_color(QString::number(ORANGE)).name(); + break; + case 2: + html_color = get_text_color(QString::number(YELLOW)).name(); + break; + case 3: + html_color = get_text_color(QString::number(GREEN)).name(); + break; + default: + html_color = get_text_color(QString::number(BLUE)).name(); + rainbow_counter = -1; + } + + ++rainbow_counter; + + ui_vp_message->insertHtml("<font color=\"" + html_color + "\">" + f_character + "</font>"); + } + else ui_vp_message->insertHtml(f_character); } diff --git a/path_functions.cpp b/path_functions.cpp index a22b775e..c51cfde3 100644 --- a/path_functions.cpp +++ b/path_functions.cpp @@ -149,7 +149,7 @@ QString AOApplication::get_case_sensitive_path(QString p_file) { return file_parent_dir + "/" + file_basename; //last resort, dirlist parent dir and find case insensitive match - QRegExp file_rx = QRegExp(file_basename, Qt::CaseInsensitive); + QRegExp file_rx = QRegExp(file_basename, Qt::CaseInsensitive, QRegExp::FixedString); QStringList files = QDir(file_parent_dir).entryList(); int result = files.indexOf(file_rx); |