From: Juergen Spitzmueller <spitz@lyx.org>
Date: Sun, 12 Nov 2017 13:44:18 +0000 (+0100)
Subject: InsetExternal: update renderer after preview status change
X-Git-Tag: 2.3.0rc2~265
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=1a8873d7be005b20764133986f5983e1400754c1;p=features.git

InsetExternal: update renderer after preview status change

This fixes a crash when changing instant preview prefs while
document with previewed external inset is opened.

Fixes: #10785
(cherry picked from commit 0842e22f4551e84dbf24259c65994c760fc22925)
---

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);
diff --git a/src/insets/InsetExternal.h b/src/insets/InsetExternal.h
index 420550f924..75b7f70ffa 100644
--- a/src/insets/InsetExternal.h
+++ b/src/insets/InsetExternal.h
@@ -108,7 +108,7 @@ public:
 	///
 	void setParams(InsetExternalParams const &);
 	/// Update not loaded previews
-	void updatePreview();
+	void updatePreview() const;
 	/// \returns the number of rows (\n's) of generated code.
 	void latex(otexstream &, OutputParams const &) const;
 	///
@@ -163,11 +163,15 @@ private:
 	 *  and the preview should be regenerated.
 	 */
 	void fileChanged() const;
+	/// Is this inset using (instant or graphics) preview?
+	bool isPreviewed() const;
+	/// Do we have the right renderer (button, graphic or monitored preview)?
+	bool isRendererValid() const;
 
 	/// The current params
 	InsetExternalParams params_;
 	/// The thing that actually draws the image on LyX's screen.
-	unique_ptr<RenderBase> renderer_;
+	mutable unique_ptr<RenderBase> renderer_;
 	/// changes color of the button when mouse enters/leaves this inset
 	mutable std::map<BufferView const *, bool> mouse_hover_;
 };