Do not crash when entering math in ct mode with merge dialog open.

[lyx.git] / src / ConverterCache.cpp

diff --git a/src/ConverterCache.cpp b/src/ConverterCache.cpp
index 77ba7b32e64210ddbe80309976050255c0b89349..e384cdc8281a97b2b458b87a785eb409fbe2d1dd 100644 (file)
--- a/src/ConverterCache.cpp
+++ b/src/ConverterCache.cpp
@@ -49,6 +49,8 @@ unsigned long do_crc(string const & s)
 }
 
 
+// FIXME THREAD
+// This should be OK because it is only assigned during init()
 static FileName cache_dir;
 
 
@@ -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()));