Revert part of 47973dc2b, which was causing bug #11873.

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

diff --git a/src/graphics/GraphicsLoader.cpp b/src/graphics/GraphicsLoader.cpp
index 15f70b84e88349f59665ddc4e52ebf7bc73f3e9f..f0a09340916f649b2df3e5fe75968d87aa59ab1a 100644 (file)
--- a/src/graphics/GraphicsLoader.cpp
+++ b/src/graphics/GraphicsLoader.cpp
@@ -21,8 +21,6 @@
 #include "support/lassert.h"
 #include "support/Timeout.h"
 
-#include "support/bind.h"
-
 #include <queue>
 #include <memory>
 #include <set>
@@ -299,13 +297,14 @@ void Loader::reset(Params const & params) const
 
 void Loader::startLoading() const
 {
-       if (pimpl_->status_ != WaitingToLoad || !pimpl_->cached_item_)
+       if (pimpl_->status_ != WaitingToLoad || !pimpl_->cached_item_
+           || pimpl_->cached_item_->status() == Converting)
                return;
        pimpl_->startLoading();
 }
 
 
-void Loader::reload() const 
+void Loader::reload() const
 {
        pimpl_->cached_item_->startLoading();
 }