From: Richard Heck <rgheck@comcast.net>
Date: Mon, 8 Mar 2010 14:25:32 +0000 (+0000)
Subject: Fix bug #6516. Under no circumstances do we want to try to reload a
X-Git-Tag: 2.0.0~3865
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=b1d5168109c6de2de74c28cefd96afa6cc1b09e9;p=features.git

Fix bug #6516. Under no circumstances do we want to try to reload a
child document from within the export thread.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33674 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/src/insets/InsetInclude.cpp b/src/insets/InsetInclude.cpp
index 9c1cefd864..777d28e701 100644
--- a/src/insets/InsetInclude.cpp
+++ b/src/insets/InsetInclude.cpp
@@ -402,12 +402,11 @@ Buffer * InsetInclude::getChildBuffer() const
 
 Buffer * InsetInclude::loadIfNeeded() const
 {
-	// This is for background export and preview. We don't want to load the
-	// cloned child document again.
-	if (child_buffer_ && theBufferList().isLoaded(child_buffer_)
-		  && child_buffer_->isClone())
+	// This is for background export and preview. We don't even want to
+	// try to load the cloned child document again.
+	if (buffer().isClone())
 		return child_buffer_;
-
+	
 	// Don't try to load it again if we failed before.
 	if (failedtoload_ || isVerbatim(params()) || isListings(params()))
 		return 0;
@@ -415,10 +414,10 @@ Buffer * InsetInclude::loadIfNeeded() const
 	FileName const included_file = includedFilename(buffer(), params());
 	// Use cached Buffer if possible.
 	if (child_buffer_ != 0) {
-		if (theBufferList().isLoaded(child_buffer_) 
-				// additional sanity check: make sure the Buffer really is
-				// associated with the file we want.
-				&& child_buffer_ == theBufferList().getBuffer(included_file))
+		if (theBufferList().isLoaded(child_buffer_)
+    		// additional sanity check: make sure the Buffer really is
+		    // associated with the file we want.
+		    && child_buffer_ == theBufferList().getBuffer(included_file))
 			return child_buffer_;
 		// Buffer vanished, so invalidate cache and try to reload.
 		child_buffer_ = 0;