ExternalTemplate.cpp:

[lyx.git] / src / insets / RenderGraphic.cpp

diff --git a/src/insets/RenderGraphic.cpp b/src/insets/RenderGraphic.cpp
index 392ac1f1220fb715bc922561a1c92ad2f1c73520..df1a93a1804f565301945bf8b5c60a94ef899a74 100644 (file)
--- a/src/insets/RenderGraphic.cpp
+++ b/src/insets/RenderGraphic.cpp
@@ -67,8 +67,7 @@ namespace {
 
 bool displayGraphic(graphics::Params const & params)
 {
-       return params.display != graphics::NoDisplay &&
-               lyxrc.display_graphics != graphics::NoDisplay;
+       return params.display && lyxrc.display_graphics;
 }
 
 
@@ -133,8 +132,14 @@ bool readyToDisplay(graphics::Loader const & loader)
 
 void RenderGraphic::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-       bool image_ready = displayGraphic(params_) && readyToDisplay(loader_);
+       if (displayGraphic(params_)) {
+               if (loader_.status() == graphics::WaitingToLoad)
+                       loader_.startLoading();
+               if (!loader_.monitoring())
+                       loader_.startMonitoring();
+       }
 
+       bool image_ready = displayGraphic(params_) && readyToDisplay(loader_);
        if (image_ready) {
                dim.wid = loader_.image()->width() + 2 * Inset::TEXT_TO_INSET_OFFSET;
                dim.asc = loader_.image()->height();
@@ -172,13 +177,6 @@ void RenderGraphic::metrics(MetricsInfo & mi, Dimension & dim) const
 
 void RenderGraphic::draw(PainterInfo & pi, int x, int y) const
 {
-       if (displayGraphic(params_)) {
-               if (loader_.status() == graphics::WaitingToLoad)
-                       loader_.startLoading();
-               if (!loader_.monitoring())
-                       loader_.startMonitoring();
-       }
-
        // This will draw the graphics. If the graphics has not been
        // loaded yet, we draw just a rectangle.