From 92bfa2b82d3365cd33e11d519b029f5efe53861c Mon Sep 17 00:00:00 2001
From: Abdelrazak Younes <younes@lyx.org>
Date: Fri, 3 Dec 2010 21:00:15 +0000
Subject: [PATCH] Work around bugs #6814 and #6949: The issue is that
 RenderGraphics calls updateFrontend() even if within a CutAndPaste stask.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36699 a592a061-630c-0410-9148-cb99ea01b6c8
---
 src/insets/Inset.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/insets/Inset.cpp b/src/insets/Inset.cpp
index 1c0312f5a3..d1a4e8b069 100644
--- a/src/insets/Inset.cpp
+++ b/src/insets/Inset.cpp
@@ -618,6 +618,12 @@ void Inset::setDimCache(MetricsInfo const & mi, Dimension const & dim) const
 
 Buffer const * Inset::updateFrontend() const
 {
+	//FIXME (Abdel 03/12/10): see bugs #6814 and #6949
+	// If we Buffer is null and we end up here it is most probably because we
+	// are in the CutAndPaste stack. See InsetGraphics, RenderGraphics and
+	// RenderPreview.
+	if (!buffer_)
+		return 0;
 	return theApp() ? theApp()->updateInset(this) : 0;
 }
 
-- 
2.39.2