anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-18 13:40:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix date inset except on windows (bug 9925)

Browse Source 
The important thing is actually not the date inset, but the converter
machinery, which did convert the time stamps of two unused freshly created
temp files, which does not make sense, and did work before f09a9fe2 only by
accident.
This fixes the date inset on linuy, but not on windows, probably due to
different file locking semantics.
This commit is contained in:
Georg Baum 2016-01-24 17:11:31 +01:00
parent fb1cda5948
commit dc8c4f3eab
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/insets/ExternalSupport.cpp
View File

@ -260,10 +260,11 @@ void updateExternal(InsetExternalParams const & params,
// We copy the source file to the temp dir and do the conversion
// there if necessary
bool const isDir = params.filename.isDirectory();
FileName const temp_file(
makeAbsPath(params.filename.mangledFileName(),
masterBuffer->temppath()));
if (!params.filename.empty() && !params.filename.isDirectory()) {
if (!params.filename.empty() && !isDir) {
unsigned long const from_checksum = params.filename.checksum();
unsigned long const temp_checksum = temp_file.checksum();
@ -320,7 +321,8 @@ void updateExternal(InsetExternalParams const & params,
// Do we need to perform the conversion?
// Yes if to_file does not exist or if from_file is newer than to_file
if (compare_timestamps(temp_file, abs_to_file) < 0)
// or if from_file is a directory (bug 9925)
if (!isDir && compare_timestamps(temp_file, abs_to_file) < 0)
return; // SUCCESS
// FIXME (Abdel 12/08/06): Is there a need to show these errors?