From 98097da2c9bfd22ba9daf37f4bc75afde9542d46 Mon Sep 17 00:00:00 2001
From: Jean-Marc Lasgouttes <lasgouttes@lyx.org>
Date: Fri, 11 Aug 2006 22:10:23 +0000
Subject: [PATCH] 	* src/lyx_main.C (init): Do automatic reconfiguration
 even when 	running in batch mode (bug 2741).

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_4_X@14618 a592a061-630c-0410-9148-cb99ea01b6c8
---
 src/ChangeLog  |  5 +++++
 src/lyx_main.C | 12 ++++++------
 status.14x     |  2 ++
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/ChangeLog b/src/ChangeLog
index e45b8de5d8..f5c7caaf84 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2006-08-11  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
+
+	* lyx_main.C (init): Do automatic reconfiguration even when
+	running in batch mode (bug 2741).
+
 2006-08-09  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
 
 	* BufferView_pimpl.C (dispatch/LFUN_NEXT_INSET_TOGGLE): moved from
diff --git a/src/lyx_main.C b/src/lyx_main.C
index 5ad80bf759..c6c45fb7e8 100644
--- a/src/lyx_main.C
+++ b/src/lyx_main.C
@@ -458,12 +458,12 @@ void LyX::init()
 	if (!lyxrc.path_prefix.empty())
 		prependEnvPath("PATH", lyxrc.path_prefix);
 
-	// Check that user LyX directory is ok. We don't do that if
-	// running in batch mode.
-	if (lyx_gui::use_gui) {
-		if (queryUserLyXDir(package().explicit_user_support()))
-			reconfigureUserLyXDir();
-	} else {
+	// Check that user LyX directory is ok. 
+	if (queryUserLyXDir(package().explicit_user_support()))
+		reconfigureUserLyXDir();
+
+	// no need for a splash when there is no GUI
+	if (!lyx_gui::use_gui) {
 		first_start = false;
 	}
 
diff --git a/status.14x b/status.14x
index 2b721b73aa..6129defb83 100644
--- a/status.14x
+++ b/status.14x
@@ -77,6 +77,8 @@ What's new
 
 - Log the output of configure.py to a log file configure.log.
 
+- Do automatic reconfiguration even when running in batch mode (bug 2741).
+
 - Change the encoding of some python scripts from iso-8859-15 to
   iso-8859-1. The former causes problems with embedded python.