From 3f0e2d2c6bc53da68c6eb95877bad4c5c1f5b61d Mon Sep 17 00:00:00 2001 From: Stefan Hacker Date: Sat, 13 Jun 2015 04:19:08 +0200 Subject: [PATCH] Make change of language and users top settings require restart Changing these options will now trigger the new restart request. --- src/mumble/LookConfig.cpp | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/mumble/LookConfig.cpp b/src/mumble/LookConfig.cpp index 45fbb48eb..11622f4a1 100644 --- a/src/mumble/LookConfig.cpp +++ b/src/mumble/LookConfig.cpp @@ -152,10 +152,15 @@ void LookConfig::load(const Settings &r) { } void LookConfig::save() const { + const QString oldLanguage = s.qsLanguage; if (qcbLanguage->currentIndex() == 0) s.qsLanguage = QString(); else s.qsLanguage = qcbLanguage->itemData(qcbLanguage->currentIndex()).toString(); + + if (s.qsLanguage != oldLanguage) { + s.requireRestartToApply = true; + } if (qcbStyle->currentIndex() == 0) s.qsStyle = QString(); @@ -180,7 +185,12 @@ void LookConfig::save() const { s.ceExpand=static_cast(qcbExpand->currentIndex()); s.ceChannelDrag=static_cast(qcbChannelDrag->currentIndex()); - s.bUserTop=qcbUsersTop->isChecked(); + + if (qcbUsersTop->isChecked() != s.bUserTop) { + s.bUserTop = qcbUsersTop->isChecked(); + s.requireRestartToApply = true; + } + s.aotbAlwaysOnTop = static_cast(qcbAlwaysOnTop->currentIndex()); s.bAskOnQuit = qcbAskOnQuit->isChecked(); s.bHideInTray = qcbHideTray->isChecked();