anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-29 21:05:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix automatic reconfiguration.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@5450 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Dekel Tsur 2002-10-20 15:03:53 +00:00
parent 10e10e8ff8
commit e4707d7f88
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ChangeLog
View File

@ -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> 2002-10-17 Dekel Tsur <dekelts@tau.ac.il>
* lyxlength.C (inPixels): Fix hanfling of negative length. * lyxlength.C (inPixels): Fix hanfling of negative length.

8
src/lyx_main.C
View File

@ -577,13 +577,13 @@ void LyX::queryUserLyXDir(bool explicit_userdir)
FileInfo fileInfo(user_lyxdir); FileInfo fileInfo(user_lyxdir);
if (fileInfo.isOK() && fileInfo.isDir()) { if (fileInfo.isOK() && fileInfo.isDir()) {
first_start = false; first_start = false;
Path p(user_lyxdir);
FileInfo script(configure_script); FileInfo script(configure_script);
FileInfo defaults("lyxrc.defaults"); FileInfo defaults(AddName(user_lyxdir, "lyxrc.defaults"));
if (!defaults.isOK() if (defaults.isOK() && script.isOK()
|| defaults.getModificationTime() < script.getModificationTime()) { && defaults.getModificationTime() < script.getModificationTime()) {
lyxerr << _("LyX: reconfiguring user directory") lyxerr << _("LyX: reconfiguring user directory")
<< endl; << endl;
Path p(user_lyxdir);
::system(configure_script.c_str()); ::system(configure_script.c_str());
lyxerr << "LyX: " << _("Done!") << endl; lyxerr << "LyX: " << _("Done!") << endl;
} }