From e4707d7f8854aad8176aa8463739e6cb26943e86 Mon Sep 17 00:00:00 2001 From: Dekel Tsur Date: Sun, 20 Oct 2002 15:03:53 +0000 Subject: [PATCH] Fix automatic reconfiguration. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@5450 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/ChangeLog | 4 ++++ src/lyx_main.C | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) 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 + + * lyx_main.C (queryUserLyXDir): Fix automatic reconfiguration. + 2002-10-17 Dekel Tsur * 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; }