2 files changed, 15 insertions, 9 deletions

diff --git a/src/chatlogpiece.cpp b/src/chatlogpiece.cpp
index ec964b91..2a041f13 100644
--- a/src/chatlogpiece.cpp
+++ b/src/chatlogpiece.cpp
@@ -5,27 +5,31 @@ chatlogpiece::chatlogpiece()
   name = tr("UNKNOWN");
   showname = tr("UNKNOWN");
   message = tr("UNKNOWN");
+  color = 0;
   p_is_song = false;
   datetime = QDateTime::currentDateTime().toUTC();
 }
 
 chatlogpiece::chatlogpiece(QString p_name, QString p_showname,
-                           QString p_message, bool p_song)
+                           QString p_message, bool p_song, int p_color)
 {
   name = p_name;
   showname = p_showname;
   message = p_message;
   p_is_song = p_song;
+  color = p_color;
   datetime = QDateTime::currentDateTime().toUTC();
 }
 
 chatlogpiece::chatlogpiece(QString p_name, QString p_showname,
-                           QString p_message, bool p_song, QDateTime p_datetime)
+                           QString p_message, bool p_song, int p_color,
+                           QDateTime p_datetime)
 {
   name = p_name;
   showname = p_showname;
   message = p_message;
   p_is_song = p_song;
+  color = p_color;
   datetime = p_datetime.toUTC();
 }
 
@@ -41,6 +45,8 @@ bool chatlogpiece::is_song() { return p_is_song; }
 
 QString chatlogpiece::get_datetime_as_string() { return datetime.toString(); }
 
+int chatlogpiece::get_chat_color() { return color; }
+
 QString chatlogpiece::get_full()
 {
   QString full = "[";
diff --git a/src/courtroom.cpp b/src/courtroom.cpp
index 0991a52a..2e2f2a5a 100644
--- a/src/courtroom.cpp
+++ b/src/courtroom.cpp
@@ -1787,7 +1787,7 @@ void Courtroom::handle_chatmessage(QStringList *p_contents)
     f_charname = ao_app->get_showname(char_list.at(f_char_id).name);
 
   chatlogpiece *temp =
-      new chatlogpiece(f_charname, f_showname, m_chatmessage[MESSAGE], false);
+      new chatlogpiece(f_charname, f_showname, m_chatmessage[MESSAGE], false, m_chatmessage[TEXT_COLOR].toInt());
   ic_chatlog_history.append(*temp);
   ao_app->append_to_file(temp->get_full(), ao_app->log_filename, true);
 
@@ -1796,7 +1796,7 @@ void Courtroom::handle_chatmessage(QStringList *p_contents)
     ic_chatlog_history.removeFirst();
   }
 
-  append_ic_text(m_chatmessage[MESSAGE], f_showname);
+  append_ic_text(m_chatmessage[MESSAGE], f_showname, "", m_chatmessage[TEXT_COLOR].toInt());
 
   int objection_mod = m_chatmessage[OBJECTION_MOD].toInt();
   QString f_char = m_chatmessage[CHAR_NAME];
@@ -2482,7 +2482,7 @@ QString Courtroom::filter_ic_text(QString p_text, bool html, int target_pos,
   return p_text_escaped;
 }
 
-void Courtroom::append_ic_text(QString p_text, QString p_name, QString p_action)
+void Courtroom::append_ic_text(QString p_text, QString p_name, QString p_action, int color)
 {
   QTextCharFormat bold;
   QTextCharFormat normal;
@@ -2495,7 +2495,7 @@ void Courtroom::append_ic_text(QString p_text, QString p_name, QString p_action)
 
   if (p_action == "")
     p_text = filter_ic_text(p_text, ao_app->is_colorlog_enabled(), -1,
-                            m_chatmessage[TEXT_COLOR].toInt());
+                            color);
 
   if (log_goes_downwards) {
     const bool is_scrolled_down =
@@ -3080,7 +3080,7 @@ void Courtroom::handle_song(QStringList *p_contents)
     }
 
     if (!mute_map.value(n_char)) {
-      chatlogpiece *temp = new chatlogpiece(str_char, str_show, f_song, true);
+      chatlogpiece *temp = new chatlogpiece(str_char, str_show, f_song, true, m_chatmessage[TEXT_COLOR].toInt());
       ic_chatlog_history.append(*temp);
       ao_app->append_to_file(temp->get_full(), ao_app->log_filename, true);
 
@@ -4516,14 +4516,14 @@ void Courtroom::on_showname_enable_clicked()
         append_ic_text(item.get_message(), item.get_showname(),
                        tr("has played a song"));
       else
-        append_ic_text(item.get_message(), item.get_showname());
+        append_ic_text(item.get_message(), item.get_showname(), "", item.get_chat_color());
     }
     else {
       if (item.is_song())
         append_ic_text(item.get_message(), item.get_name(),
                        tr("has played a song"));
       else
-        append_ic_text(item.get_message(), item.get_name());
+        append_ic_text(item.get_message(), item.get_name(), "", item.get_chat_color());
     }
   }