From 8952ca05a839233e790c6d30a2b6568c7ad77353 Mon Sep 17 00:00:00 2001
From: Charles Dang <exodia339@gmail.com>
Date: Sun, 21 Feb 2016 20:04:30 +1100
Subject: [PATCH] tpreferences: always apply suffix to bound status labels

---
 src/gui/dialogs/preferences_dialog.cpp | 8 ++++----
 src/gui/dialogs/preferences_dialog.hpp | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/gui/dialogs/preferences_dialog.cpp b/src/gui/dialogs/preferences_dialog.cpp
index 5593c2b72578..50d4889191ad 100644
--- a/src/gui/dialogs/preferences_dialog.cpp
+++ b/src/gui/dialogs/preferences_dialog.cpp
@@ -274,7 +274,7 @@ void tpreferences::bind_status_label(T& parent, const std::string& label_id,
 
 	parent.set_callback_state_change(boost::bind(
 		&tpreferences::status_label_callback<T>,
-		this, boost::ref(parent), boost::ref(label)));
+		this, boost::ref(parent), boost::ref(label), ""));
 }
 
 void tpreferences::bind_status_label(tslider& parent, const std::string& label_id,
@@ -285,7 +285,7 @@ void tpreferences::bind_status_label(tslider& parent, const std::string& label_i
 
 	connect_signal_notify_modified(parent, boost::bind(
 		&tpreferences::status_label_callback<tslider>,
-		this, boost::ref(parent), boost::ref(label)));
+		this, boost::ref(parent), boost::ref(label), suffix));
 }
 
 void tpreferences::setup_friends_list(twindow& window)
@@ -962,9 +962,9 @@ void tpreferences::simple_combobox_callback(const tcombobox& widget,
 
 template <typename T>
 void tpreferences::status_label_callback(T& parent_widget,
-		tcontrol& label_widget)
+		tcontrol& label_widget, const std::string& suffix)
 {
-	label_widget.set_label(disambiguate_widget_value(parent_widget));
+	label_widget.set_label(disambiguate_widget_value(parent_widget) + suffix);
 }
 
 // Special fullsceen callback
diff --git a/src/gui/dialogs/preferences_dialog.hpp b/src/gui/dialogs/preferences_dialog.hpp
index 28a05cbb7450..ef4a96073d81 100644
--- a/src/gui/dialogs/preferences_dialog.hpp
+++ b/src/gui/dialogs/preferences_dialog.hpp
@@ -180,7 +180,7 @@ class tpreferences : public tdialog
 
 	template <typename T>
 	void status_label_callback(T& parent_widget,
-		tcontrol& label_widget);
+		tcontrol& label_widget, const std::string& suffix = "");
 
 	typedef std::pair<ttoggle_button*, int> lobby_radio_toggle;
 	std::vector<lobby_radio_toggle> lobby_joins_;