aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoroldmud0 <oldmud0@users.noreply.github.com>2021-04-23 01:58:55 -0500
committerGitHub <noreply@github.com>2021-04-23 01:58:55 -0500
commit93c8befeceae051778fce16fc5c1bfef94cb5562 (patch)
tree6cb4ac11b5cbf4830582ef1f9f11a8a6fc6b4422
parentb7585a1c6f67ae1f5754f0abb054edff9e03bfa4 (diff)
parent9359ed7f54dd996d879e465c87d5b9631bc6d6bb (diff)
Merge pull request #538 from AttorneyOnline/fix/showname-enable
Fix shownames disappearing forever if a message is sent while the shownames checkbox is unticked
-rw-r--r--src/courtroom.cpp7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/courtroom.cpp b/src/courtroom.cpp
index 776c0c93..8bbaaa93 100644
--- a/src/courtroom.cpp
+++ b/src/courtroom.cpp
@@ -2067,11 +2067,6 @@ void Courtroom::log_chatmessage(QString f_message, int f_char_id, QString f_show
if (f_char_id != -1) {
// Grab the char.ini showname
f_showname = ao_app->get_showname(char_list.at(f_char_id).name);
- // If custom serversided shownames are not enabled
- if (!ui_showname_enable->isChecked()) {
- // Set the display name to the char.ini showname
- f_displayname = f_showname;
- }
}
// If display name is just whitespace, use the char.ini showname.
if (f_displayname.trimmed().isEmpty())
@@ -2171,6 +2166,8 @@ void Courtroom::log_chatmessage(QString f_message, int f_char_id, QString f_show
append_ic_text(f_message, f_displayname, "",f_color);
break;
}
+ if (!ui_showname_enable->isChecked())
+ regenerate_ic_chatlog();
}
bool Courtroom::handle_objection()