Add \makeat switches to babel settings if necessary.

[lyx.git] / src / graphics / GraphicsLoader.cpp

diff --git a/src/graphics/GraphicsLoader.cpp b/src/graphics/GraphicsLoader.cpp
index 3e6664651e4cc2e4ebfbe786f9ed7523721fc80e..36f2839446bbd12f5e0e4cc4b9cf9860f217e438 100644 (file)
--- a/src/graphics/GraphicsLoader.cpp
+++ b/src/graphics/GraphicsLoader.cpp
@@ -96,7 +96,7 @@ void LoaderQueue::loadNext()
                if (ptr->status() == WaitingToLoad)
                        ptr->startLoading();
        }
-       if (cache_queue_.size()) {
+       if (!cache_queue_.empty()) {
                startLoader();
        } else {
                stopLoader();
@@ -368,7 +368,11 @@ void Loader::Impl::resetFile(FileName const & file)
                // signal needs to be disconnected.
                sc_.disconnect();
                cached_item_.reset();
-               Cache::get().remove(old_file);
+               if (status_ != Converting) {
+                       Cache::get().remove(old_file);
+               } else {
+                       //TODO remove cache item when it is not busy any more, see #7163
+               }
        }
 
        status_ = cached_item_.get() ? cached_item_->status() : WaitingToLoad;