anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-07 12:32:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix bug #6516. Under no circumstances do we want to try to reload a

Browse Source 
child document from within the export thread.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33674 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Richard Heck 2010-03-08 14:25:32 +00:00
parent da4a77c4ae
commit b1d5168109
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/insets/InsetInclude.cpp
View File

@ -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;