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 ffc28e8dcf8b41b1a2919695bb8f4495f77a0541..6d7d0c5f74ba1c69a7bdfa0d5d7eae70b4636f28 100644 (file)
--- 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 2befa6620eec5e2976a77dba695a271c8968bd76..3c50f3e0ac99062d18b1d574526af8565b64c6d1 100644 (file)
--- 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;
                }