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:
Abdelrazak Younes 2008-03-04 17:45:23 +00:00
parent 59c298b750
commit d7ccaedfe0
2 changed files with 1 additions and 3 deletions

View File

@ -2394,9 +2394,6 @@ void Buffer::loadChildDocuments() const
child->loadChildDocuments();
}
if (use_gui && masterBuffer() == this)
updateLabels(*this);
updateMacros();
}

View File

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