Merge pull request #255 from scatterflower/2.8

Do not update colors in log for each IC message

1 files changed, 1 insertions, 9 deletions

diff --git a/src/courtroom.cpp b/src/courtroom.cpp
index be7588a5..cc35a7bd 100644
--- a/src/courtroom.cpp
+++ b/src/courtroom.cpp
@@ -1885,14 +1885,6 @@ void Courtroom::handle_chatmessage(QStringList *p_contents)
   QString f_char = m_chatmessage[CHAR_NAME];
   QString f_custom_theme = ao_app->get_char_shouts(f_char);
 
-  // Load the colors in case it's using a custom chatbox with custom colors.
-  // Or reload the default ones in case it's not using custom colors
-  color_rgb_list.clear();
-  for (int c = 0; c < max_colors; ++c) {
-    QColor color = ao_app->get_chat_color("c" + QString::number(c), f_char);
-    color_rgb_list.append(color);
-  }
-
   append_ic_text(m_chatmessage[MESSAGE], f_displayname, "",
                  m_chatmessage[TEXT_COLOR].toInt());
 
@@ -1927,8 +1919,8 @@ void Courtroom::handle_chatmessage(QStringList *p_contents)
                               shout_stay_time);
         objection_player->play("custom", f_char, f_custom_theme);
       }
-      break;
       m_chatmessage[EMOTE_MOD] = 1;
+      break;
     }
     sfx_player->clear(); // Objection played! Cut all sfx.
   }