Merge branch 'master' into cleanup

in1tiate · web-flow · commit a9e2ea19508c · 2025-01-13T17:30:28.000-06:00
diff --git a/src/widgets/playerlistwidget.cpp b/src/widgets/playerlistwidget.cpp
@@ -196,5 +196,5 @@ void PlayerListWidget::updatePlayer(int playerId, bool updateIcon)
 QString PlayerListWidget::formatLabel(const PlayerData &data)
 {
   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();
 }

Original file line number	Diff line number	Diff line change
`@@ -196,5 +196,5 @@ void PlayerListWidget::updatePlayer(int playerId, bool updateIcon)`
`196`	`196`	`QString PlayerListWidget::formatLabel(const PlayerData &data)`
`197`	`197`	`{`
`198`	`198`	`QString format = Options::getInstance().playerlistFormatString();`
`199`		`- 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();`
	`199`	`+ 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();`
`200`	`200`	`}`