Merge branch 'master' into cleanup

This commit is contained in:
in1tiate 2025-01-13 17:30:28 -06:00 committed by GitHub
commit a9e2ea1950
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -196,5 +196,5 @@ void PlayerListWidget::updatePlayer(int playerId, bool updateIcon)
QString PlayerListWidget::formatLabel(const PlayerData &data) QString PlayerListWidget::formatLabel(const PlayerData &data)
{ {
QString format = Options::getInstance().playerlistFormatString(); QString format = Options::getInstance().playerlistFormatString();
return format.replace("{id}", QString::number(data.id)).replace("{character}", data.character).replace("{displayname}", data.character_name.isEmpty() ? "No Data" : data.character_name).replace("{username}", m_is_authenticated ? data.name : "").simplified(); return format.replace("{id}", QString::number(data.id)).replace("{character}", data.character).replace("{displayname}", data.character_name.isEmpty() ? "No Data" : data.character_name).replace("{username}", data.name).simplified();
} }