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

diff --git a/src/insets/Inset.cpp b/src/insets/Inset.cpp
index 1c0312f5a3107be6ef4e3bc1c1755a316ff3926e..d1a4e8b0696e0c882741266d9875f6ef0a2014ec 100644 (file)
--- 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;
 }