From: Dekel Tsur <dekelts@tau.ac.il>
Date: Sun, 20 Oct 2002 15:03:53 +0000 (+0000)
Subject: Fix automatic reconfiguration.
X-Git-Tag: 1.6.10~18142
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=e4707d7f8854aad8176aa8463739e6cb26943e86;p=features.git

Fix automatic reconfiguration.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@5450 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/src/ChangeLog b/src/ChangeLog
index ffc28e8dcf..6d7d0c5f74 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2002-10-09  Dekel Tsur  <dekelts@tau.ac.il>
+
+	* lyx_main.C (queryUserLyXDir): Fix automatic reconfiguration.
+
 2002-10-17  Dekel Tsur  <dekelts@tau.ac.il>
 
 	* lyxlength.C (inPixels): Fix hanfling of negative length.
diff --git a/src/lyx_main.C b/src/lyx_main.C
index 2befa6620e..3c50f3e0ac 100644
--- a/src/lyx_main.C
+++ b/src/lyx_main.C
@@ -577,13 +577,13 @@ void LyX::queryUserLyXDir(bool explicit_userdir)
 	FileInfo fileInfo(user_lyxdir);
 	if (fileInfo.isOK() && fileInfo.isDir()) {
 		first_start = false;
-		Path p(user_lyxdir);
 		FileInfo script(configure_script);
-		FileInfo defaults("lyxrc.defaults");
-		if (!defaults.isOK()
-		    || defaults.getModificationTime() < script.getModificationTime()) {
+		FileInfo defaults(AddName(user_lyxdir, "lyxrc.defaults"));
+		if (defaults.isOK() && script.isOK()
+		    && defaults.getModificationTime() < script.getModificationTime()) {
 			lyxerr << _("LyX: reconfiguring user directory")
 			       << endl;
+			Path p(user_lyxdir);
 			::system(configure_script.c_str());
 			lyxerr << "LyX: " << _("Done!") << endl;
 		}