X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FConverterCache.cpp;h=56a39c775d76da772180919699623742d7a34c99;hb=14001c49fe0fb3d95a0f69f63344e7ae59d28180;hp=335de9de241ffb98c796bb3a39d4a1fc43294d9b;hpb=4dc976497f7c384b2e399662ae6a9b19bc98d978;p=lyx.git

diff --git a/src/ConverterCache.cpp b/src/ConverterCache.cpp
index 335de9de24..56a39c775d 100644
--- a/src/ConverterCache.cpp
+++ b/src/ConverterCache.cpp
@@ -216,9 +216,6 @@ ConverterCache::ConverterCache()
 
 ConverterCache::~ConverterCache()
 {
-	if (!lyxrc.use_converter_cache)
-		return;
-	pimpl_->writeIndex();
 	delete pimpl_;
 }
 
@@ -248,6 +245,12 @@ void ConverterCache::init()
 }
 
 
+void ConverterCache::writeIndex() const
+{
+	pimpl_->writeIndex();
+}
+
+
 void ConverterCache::add(FileName const & orig_from, string const & to_format,
 		FileName const & converted_file) const
 {
@@ -287,7 +290,8 @@ void ConverterCache::add(FileName const & orig_from, string const & to_format,
 			return;
 		}
 		item->checksum = checksum;
-		if (!mover.copy(converted_file, item->cache_name)) {
+		if (!mover.copy(converted_file, item->cache_name,
+		              onlyFilename(item->cache_name.absFilename()))) {
 			LYXERR(Debug::FILES, "Could not copy file " << orig_from << " to "
 				<< item->cache_name);
 		} else if (!item->cache_name.changePermission(0600)) {
@@ -297,7 +301,8 @@ void ConverterCache::add(FileName const & orig_from, string const & to_format,
 	} else {
 		CacheItem new_item(orig_from, to_format, timestamp,
 				orig_from.checksum());
-		if (mover.copy(converted_file, new_item.cache_name)) {
+		if (mover.copy(converted_file, new_item.cache_name,
+		              onlyFilename(new_item.cache_name.absFilename()))) {
 			if (!new_item.cache_name.changePermission(0600)) {
 				LYXERR(Debug::FILES, "Could not change file mode"
 					<< new_item.cache_name);
@@ -433,7 +438,8 @@ bool ConverterCache::copy(FileName const & orig_from, string const & to_format,
 	CacheItem * const item = pimpl_->find(orig_from, to_format);
 	LASSERT(item, /**/);
 	Mover const & mover = getMover(to_format);
-	return mover.copy(item->cache_name, dest);
+	return mover.copy(item->cache_name, dest,
+	                  onlyFilename(dest.absFilename()));
 }
 
 } // namespace lyx