X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FConverterCache.cpp;h=29d07e4a04a5b7ce05aca502cc1c4d17b712d7f9;hb=6343d9941a63dbf788516eb325e589f70f06c6f1;hp=77ba7b32e64210ddbe80309976050255c0b89349;hpb=cb5dd33475e7cca472ead1fd3eac9f174b8b76ba;p=lyx.git

diff --git a/src/ConverterCache.cpp b/src/ConverterCache.cpp
index 77ba7b32e6..29d07e4a04 100644
--- a/src/ConverterCache.cpp
+++ b/src/ConverterCache.cpp
@@ -49,13 +49,14 @@ unsigned long do_crc(string const & s)
 }
 
 
+// FIXME THREAD
+// This should be OK because it is only assigned during init()
 static FileName cache_dir;
 
 
 class CacheItem {
 public:
-	CacheItem()
-	{}
+	CacheItem() : timestamp(0), checksum(0) {}
 	CacheItem(FileName const & orig_from, string const & to_format,
 		  time_t t, unsigned long c)
 		: timestamp(t), checksum(c)
@@ -222,6 +223,7 @@ ConverterCache::~ConverterCache()
 }
 
 
+// FIXME THREAD
 ConverterCache & ConverterCache::get()
 {
 	// Now return the cache
@@ -431,7 +433,7 @@ FileName const & ConverterCache::cacheName(FileName const & orig_from,
 	LYXERR(Debug::FILES, orig_from << ' ' << to_format);
 
 	CacheItem * const item = pimpl_->find(orig_from, to_format);
-	LASSERT(item, /**/);
+	LASSERT(item, { static const FileName fn; return fn; });
 	return item->cache_name;
 }
 
@@ -455,7 +457,7 @@ bool ConverterCache::copy(FileName const & orig_from, string const & to_format,
 	}
 
 	CacheItem * const item = pimpl_->find(orig_from, to_format);
-	LASSERT(item, /**/);
+	LASSERT(item, return false);
 	Mover const & mover = getMover(to_format);
 	return mover.copy(item->cache_name, dest,
 	                  onlyFileName(dest.absFileName()));