From c829c24b568f1086c49388e4a9fee07773440cf7 Mon Sep 17 00:00:00 2001
From: Jason Papakostas <vithos@gmail.com>
Date: Thu, 24 Mar 2016 04:43:55 -0500
Subject: [PATCH] fix initial disabled state for "Focus window" checkbox

---
 src/widget/form/settings/generalform.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/widget/form/settings/generalform.cpp b/src/widget/form/settings/generalform.cpp
index 0ac6a3bc0..3f0cd8fc7 100644
--- a/src/widget/form/settings/generalform.cpp
+++ b/src/widget/form/settings/generalform.cpp
@@ -131,8 +131,12 @@ GeneralForm::GeneralForm(SettingsWidget *myParent) :
     bodyUI->useEmoticons->setChecked(Settings::getInstance().getUseEmoticons());
     bodyUI->autoacceptFiles->setChecked(Settings::getInstance().getAutoSaveEnabled());
     bodyUI->autoSaveFilesDir->setText(Settings::getInstance().getGlobalAutoAcceptDir());
-    bodyUI->showWindow->setChecked(Settings::getInstance().getShowWindow());
+
+    bool showWindow = Settings::getInstance().getShowWindow();
+
+    bodyUI->showWindow->setChecked(showWindow);
     bodyUI->showInFront->setChecked(Settings::getInstance().getShowInFront());
+    bodyUI->showInFront->setEnabled(showWindow);
     bodyUI->notifySound->setChecked(Settings::getInstance().getNotifySound());
     bodyUI->groupAlwaysNotify->setChecked(Settings::getInstance().getGroupAlwaysNotify());
     bodyUI->cbFauxOfflineMessaging->setChecked(Settings::getInstance().getFauxOfflineMessaging());