From 51aa20b3edad3624d3baf86acc601b8137a72e36 Mon Sep 17 00:00:00 2001
From: Enrico Forestieri <forenr@lyx.org>
Date: Sat, 11 Dec 2010 15:21:23 +0000
Subject: [PATCH] Disable the "Single instance" check box if the lyxpipe has
 not been set up.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36827 a592a061-630c-0410-9148-cb99ea01b6c8
---
 src/frontends/qt4/GuiPrefs.cpp | 3 ++-
 src/frontends/qt4/ui/PrefUi.ui | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/frontends/qt4/GuiPrefs.cpp b/src/frontends/qt4/GuiPrefs.cpp
index 434fa92776..02035202c9 100644
--- a/src/frontends/qt4/GuiPrefs.cpp
+++ b/src/frontends/qt4/GuiPrefs.cpp
@@ -2455,7 +2455,8 @@ void PrefUserInterface::update(LyXRC const & rc)
 	lastfilesSB->setValue(rc.num_lastfiles);
 	tooltipCB->setChecked(rc.use_tooltip);
 	openDocumentsInTabsCB->setChecked(rc.open_buffers_in_tabs);
-	singleInstanceCB->setChecked(rc.single_instance);
+	singleInstanceCB->setChecked(rc.single_instance && !rc.lyxpipes.empty());
+	singleInstanceCB->setEnabled(!rc.lyxpipes.empty());
 	singleCloseTabButtonCB->setChecked(rc.single_close_tab_button);
 }
 
diff --git a/src/frontends/qt4/ui/PrefUi.ui b/src/frontends/qt4/ui/PrefUi.ui
index 87fabd95c3..138c93fb74 100644
--- a/src/frontends/qt4/ui/PrefUi.ui
+++ b/src/frontends/qt4/ui/PrefUi.ui
@@ -242,7 +242,8 @@
       <item row="5" column="0" colspan="2">
        <widget class="QCheckBox" name="singleInstanceCB">
         <property name="toolTip">
-         <string>Whether to open documents in an already running instance of LyX.</string>
+	    <string>Whether to open documents in an already running instance of LyX.
+(Set the LyXServer pipe path and restart LyX to enable this feature)</string>
         </property>
         <property name="text">
          <string>S&amp;ingle instance</string>
-- 
2.39.2