Diff of /src/qtgui/uiprefs_w.cpp [502a34] .. [68e6b9]

  Switch to side-by-side view 

--- a/src/qtgui/uiprefs_w.cpp
+++ b/src/qtgui/uiprefs_w.cpp
@@ -138,6 +138,10 @@
 
     keepSortCB->setChecked(prefs.keepSort);
     showTrayIconCB->setChecked(prefs.showTrayIcon);
+    if (!prefs.showTrayIcon) {
+        prefs.closeToTray = false;
+    }
+    closeToTrayCB->setEnabled(showTrayIconCB->checkState());
     closeToTrayCB->setChecked(prefs.closeToTray);
     showTempFileWarningCB->setChecked(prefs.showTempFileWarning == -1);
     previewHtmlCB->setChecked(prefs.previewHtml);
@@ -574,6 +578,9 @@
 
 void UIPrefsDialog::on_showTrayIconCB_clicked()
 {
+    if (!showTrayIconCB->checkState()) {
+        closeToTrayCB->setChecked(false);
+    }
     closeToTrayCB->setEnabled(showTrayIconCB->checkState());
 }