X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetExternal.cpp;h=1f0f5f2b770d271dbcedfd52514849cf6c6932f0;hb=22e6659780390a19174d1bf896317a5baf9e40d7;hp=7123d81fe916266caae1b438f25fd0e66f279b77;hpb=e30f3d76d2bee0011ceaeb5f0cc221156458cbad;p=lyx.git

diff --git a/src/insets/InsetExternal.cpp b/src/insets/InsetExternal.cpp
index 7123d81fe9..1f0f5f2b77 100644
--- a/src/insets/InsetExternal.cpp
+++ b/src/insets/InsetExternal.cpp
@@ -524,12 +524,18 @@ bool InsetExternal::showInsetDialog(BufferView * bv) const
 
 void InsetExternal::metrics(MetricsInfo & mi, Dimension & dim) const
 {
+	if (!isRendererValid())
+		updatePreview();
+
 	renderer_->metrics(mi, dim);
 }
 
 
 void InsetExternal::draw(PainterInfo & pi, int x, int y) const
 {
+	if (!isRendererValid())
+		updatePreview();
+
 	if (renderer_->asButton())
 		renderer_->setRenderState(mouse_hover_[pi.base.bv]);
 	renderer_->draw(pi, x, y);
@@ -595,9 +601,22 @@ InsetExternalParams const & InsetExternal::params() const
 }
 
 
-void InsetExternal::updatePreview()
+bool InsetExternal::isPreviewed() const
+{
+	return (external::getTemplatePtr(params_) && !params_.filename.empty()
+		&& params_.display
+		&& lyxrc.display_graphics
+		&& params_.preview_mode != PREVIEW_OFF
+		&& (params_.preview_mode != PREVIEW_INSTANT
+		    || RenderPreview::previewText()));
+}
+
+
+bool InsetExternal::isRendererValid() const
 {
-	setParams(params_);
+	if (!renderer_->asButton())
+		return isPreviewed();
+	return !isPreviewed();
 }
 
 
@@ -609,12 +628,13 @@ void InsetExternal::setParams(InsetExternalParams const & p)
 	// will use this.
 	defaultTemplateName = params_.templatename();
 
-	if (!external::getTemplatePtr(params_) || params_.filename.empty()
-		|| !params_.display
-		|| !lyxrc.display_graphics
-		|| params_.preview_mode == PREVIEW_OFF
-		|| (params_.preview_mode == PREVIEW_INSTANT
-		    && !RenderPreview::previewText())) {
+	updatePreview();
+}
+
+
+void InsetExternal::updatePreview() const
+{
+	if (!isPreviewed()) {
 		RenderButton * button_ptr = renderer_->asButton();
 		if (!button_ptr) {
 			renderer_.reset(new RenderButton);