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

Fix bug #7796 (LyX creates file on startup that cannot be deleted)

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@39781 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Enrico Forestieri 2011-09-28 07:04:29 +00:00
parent 67d6eb6ed0
commit fe65104a7c
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/LyXRC.cpp
View File

@ -402,11 +402,15 @@ bool LyXRC::read(FileName const & filename, bool check_format)
LYXERR0 ("Unable to convert " << filename.absFileName() << LYXERR0 ("Unable to convert " << filename.absFileName() <<
" to format " << LYXRC_FILEFORMAT); " to format " << LYXRC_FILEFORMAT);
return false; return false;
} else {
// Keep this in the else branch, such that lexrc2 goes out
// of scope and releases the lock on tempfile before we
// attempt to remove it. This matters on Windows.
Lexer lexrc2(lyxrcTags);
lexrc2.setFile(tempfile);
LYXERR(Debug::LYXRC, "Reading '" << tempfile << "'...");
retval = read(lexrc2, check_format);
} }
Lexer lexrc2(lyxrcTags);
lexrc2.setFile(tempfile);
LYXERR(Debug::LYXRC, "Reading '" << tempfile << "'...");
retval = read(lexrc2, check_format);
tempfile.removeFile(); tempfile.removeFile();
return retval == ReadOK; return retval == ReadOK;
} }

3
status.20x
View File

@ -86,6 +86,9 @@ What's new
- Fix whitespace issues with language changes (bug 7607). - Fix whitespace issues with language changes (bug 7607).
- Fix deletion of temporary file used for preferences conversion on
Windows (bug 7796).
* USER INTERFACE * USER INTERFACE