mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-12-22 05:16:21 +00:00
Do not start from a non-relevant parent in Buffer cloning.
(cherry picked from commit e077255aea
)
This commit is contained in:
parent
b7f5fe94cd
commit
a0fb2f05c9
@ -570,13 +570,13 @@ Buffer::~Buffer()
|
||||
}
|
||||
|
||||
|
||||
Buffer * Buffer::cloneFromMaster() const
|
||||
Buffer * Buffer::cloneWithChildren() const
|
||||
{
|
||||
BufferMap bufmap;
|
||||
cloned_buffers.push_back(new CloneList);
|
||||
CloneList * clones = cloned_buffers.back();
|
||||
|
||||
masterBuffer()->cloneWithChildren(bufmap, clones);
|
||||
cloneWithChildren(bufmap, clones);
|
||||
|
||||
// make sure we got cloned
|
||||
BufferMap::const_iterator bit = bufmap.find(this);
|
||||
|
@ -157,9 +157,9 @@ public:
|
||||
/// Destructor
|
||||
~Buffer();
|
||||
|
||||
/// Clones the entire structure of which this Buffer is part, starting
|
||||
/// with the master and cloning all the children, too.
|
||||
Buffer * cloneFromMaster() const;
|
||||
/// Clones the entire structure of which this Buffer is part,
|
||||
/// cloning all the children, too.
|
||||
Buffer * cloneWithChildren() const;
|
||||
/// Just clones this single Buffer. For autosave.
|
||||
Buffer * cloneBufferOnly() const;
|
||||
///
|
||||
|
@ -3598,10 +3598,10 @@ bool GuiView::GuiViewPrivate::asyncBufferProcessing(
|
||||
#if EXPORT_in_THREAD
|
||||
if (allow_async) {
|
||||
GuiViewPrivate::busyBuffers.insert(used_buffer);
|
||||
Buffer * cloned_buffer = used_buffer->cloneFromMaster();
|
||||
Buffer * cloned_buffer = used_buffer->cloneWithChildren();
|
||||
if (!cloned_buffer) {
|
||||
Alert::error(_("Export Error"),
|
||||
_("Error cloning the Buffer."));
|
||||
_("Error cloning the Buffer."));
|
||||
return false;
|
||||
}
|
||||
QFuture<Buffer::ExportStatus> f = QtConcurrent::run(
|
||||
|
@ -48,7 +48,8 @@ What's new
|
||||
|
||||
* DOCUMENT INPUT/OUTPUT
|
||||
|
||||
|
||||
- When cloning a buffer, do not start from a parent if it is not the
|
||||
current master (e.g., when compiling a child alone).
|
||||
|
||||
|
||||
* USER INTERFACE
|
||||
|
Loading…
Reference in New Issue
Block a user