From 6a936d63d3be55a9a553b252e51f773749777e44 Mon Sep 17 00:00:00 2001 From: Jean-Marc Lasgouttes Date: Mon, 20 Aug 2012 17:20:59 +0200 Subject: [PATCH] Fix crash with undo in nested insets introduced by commit 6ec1683 The code in DocIterator::sanitize now follows more closely the previous StableDocIterator::asDocIterator code. In particular, it adds the slices one by one, since fixIfBroken will chop the cursor otherwise. --- src/DocIterator.cpp | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/DocIterator.cpp b/src/DocIterator.cpp index 5cd1c0eac3..420c782c37 100644 --- a/src/DocIterator.cpp +++ b/src/DocIterator.cpp @@ -532,12 +532,14 @@ bool DocIterator::fixIfBroken() void DocIterator::sanitize() { - // this function re-creates the cache of inset pointers - //lyxerr << "converting:\n" << *this << endl; + // keep a copy of the slices + vector const sl = slices_; + slices_.clear(); if (buffer_) inset_ = &buffer_->inset(); Inset * inset = inset_; - for (size_t i = 0, n = slices_.size(); i != n; ++i) { + // re-add the slices one by one, and adjust the inset pointer. + for (size_t i = 0, n = sl.size(); i != n; ++i) { if (inset == 0) { // FIXME LYXERR0(" Should not happen, but does e.g. after " @@ -548,14 +550,13 @@ void DocIterator::sanitize() fixIfBroken(); break; } - slices_[i].inset_ = inset; + push_back(sl[i]); + top().inset_ = inset; if (fixIfBroken()) break; if (i + 1 != n) - inset = slices_[i].inset().inMathed() ? slices_[i].cell()[slices_[i].pos()].nucleus() - : slices_[i].paragraph().getInset(pos()); + inset = nextInset(); } - //lyxerr << "convert:\n" << *this << " to:\n" << dit << endl; } @@ -626,7 +627,7 @@ StableDocIterator::StableDocIterator(DocIterator const & dit) DocIterator StableDocIterator::asDocIterator(Buffer * buf) const { - DocIterator dit = DocIterator(buf); + DocIterator dit(buf); dit.slices_ = data_; dit.sanitize(); return dit; -- 2.39.2