Update font info on restore default settings

mumble-voip · Nov 2, 2015 · 8e896b0 · 8e896b0
1 parent 008a7f1
commit 8e896b0
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/src/mumble/LookConfig.cpp b/src/mumble/LookConfig.cpp
@@ -112,9 +112,13 @@ void LookConfig::updateFontInfo(QLabel *label, const QFont &font) {
 }
 
 void LookConfig::updateFontInfo() {
-	updateFontInfo(qlFontLogCurrent, s.qfFontLog);
-	updateFontInfo(qlFontInputCurrent, s.qfFontInput);
-	updateFontInfo(qlFontTreeCurrent, s.qfFontTree);
+	updateFontInfo(s);
+}
+
+void LookConfig::updateFontInfo(const Settings &r) {
+	updateFontInfo(qlFontLogCurrent, r.qfFontLog);
+	updateFontInfo(qlFontInputCurrent, r.qfFontInput);
+	updateFontInfo(qlFontTreeCurrent, r.qfFontTree);
 }
 
 QString LookConfig::title() const {
@@ -183,6 +187,8 @@ void LookConfig::load(const Settings &r) {
 		}
 	}
 
+	updateFontInfo(r);
+
 	loadComboBox(qcbAlwaysOnTop, r.aotbAlwaysOnTop);
 
 	loadComboBox(qcbExpand, r.ceExpand);

diff --git a/src/mumble/LookConfig.h b/src/mumble/LookConfig.h
@@ -57,6 +57,7 @@ class LookConfig : public ConfigWidget, Ui::LookConfig {
 	protected:
 		void updateFontInfo(QLabel *l, const QFont &f);
 		void updateFontInfo();
+		void updateFontInfo(const Settings &r);
 		void changeFont(QFont & font);
 	protected slots:
 		void on_qpbFontLog_clicked();