From 0ef728d3853aed1e0d845754b2082524183e5d16 Mon Sep 17 00:00:00 2001 From: ngosang Date: Thu, 14 May 2015 21:48:09 +0200 Subject: [PATCH] Fix Start Minimized checkbox in Options --- src/gui/options_imp.cpp | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/src/gui/options_imp.cpp b/src/gui/options_imp.cpp index fdc85d96f..cc39cc611 100644 --- a/src/gui/options_imp.cpp +++ b/src/gui/options_imp.cpp @@ -529,16 +529,20 @@ void options_imp::loadOptions() { const Preferences* const pref = Preferences::instance(); setLocale(pref->getLocale()); checkAltRowColors->setChecked(pref->useAlternatingRowColors()); - checkShowSystray->setChecked(pref->systrayIntegration()); + checkShowSplash->setChecked(!pref->isSplashScreenDisabled()); - if (checkShowSystray->isChecked()) { - checkCloseToSystray->setChecked(pref->closeToTray()); - checkMinimizeToSysTray->setChecked(pref->minimizeToTray()); - checkStartMinimized->setChecked(pref->startMinimized()); - } - comboTrayIcon->setCurrentIndex(pref->trayIconStyle()); + checkStartMinimized->setChecked(pref->startMinimized()); checkProgramExitConfirm->setChecked(pref->confirmOnExit()); + + checkShowSystray->setChecked(pref->systrayIntegration()); + if (checkShowSystray->isChecked()) { + checkMinimizeToSysTray->setChecked(pref->minimizeToTray()); + checkCloseToSystray->setChecked(pref->closeToTray()); + comboTrayIcon->setCurrentIndex(pref->trayIconStyle()); + } + checkPreventFromSuspend->setChecked(pref->preventFromSuspend()); + #ifdef Q_OS_WIN checkStartup->setChecked(pref->WinStartup()); // Windows: file association settings