mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-10 20:04:46 +00:00
Invert loadChildDocuments() and updateLabels() calls. This is necessary to avoid potential recursive calls of updateLabels().
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23457 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
59c298b750
commit
d7ccaedfe0
@ -2394,9 +2394,6 @@ void Buffer::loadChildDocuments() const
|
||||
child->loadChildDocuments();
|
||||
}
|
||||
|
||||
if (use_gui && masterBuffer() == this)
|
||||
updateLabels(*this);
|
||||
|
||||
updateMacros();
|
||||
}
|
||||
|
||||
|
@ -491,6 +491,7 @@ void updateLabels(Buffer const & buf, bool childonly)
|
||||
// start over the counters
|
||||
textclass.counters().reset();
|
||||
buf.clearReferenceCache();
|
||||
buf.loadChildDocuments();
|
||||
}
|
||||
|
||||
Buffer & cbuf = const_cast<Buffer &>(buf);
|
||||
|
Loading…
Reference in New Issue
Block a user