bug 1987: Crash when switching to different document class

[lyx.git] / src / BufferView_pimpl.C

diff --git a/src/BufferView_pimpl.C b/src/BufferView_pimpl.C
index 0934b425683501ae599c593fa9f88ca99c3daa38..5df76a3ea3415328f1af43ba95d7aadbfa52b9ca 100644 (file)
--- a/src/BufferView_pimpl.C
+++ b/src/BufferView_pimpl.C
@@ -386,8 +386,20 @@ void BufferView::Pimpl::setBuffer(Buffer * b)
        owner_->updateWindowTitle();
 
        // This is done after the layout combox has been populated
-       if (buffer_)
-               owner_->setLayout(cursor_.paragraph().layout()->name());
+       if (buffer_) {
+               size_t i = cursor_.depth() - 1;
+               // we know we'll eventually find a paragraph
+               while (true) {
+                       CursorSlice const & slice = cursor_[i];
+                       if (!slice.inset().inMathed()) {
+                               LyXLayout_ptr const layout = slice.paragraph().layout();
+                               owner_->setLayout(layout->name());
+                               break;
+                       }
+                       BOOST_ASSERT(i>0);
+                       --i;
+               }
+       }       
 
        if (buffer_ && lyx::graphics::Previews::status() != LyXRC::PREVIEW_OFF)
                lyx::graphics::Previews::get().generateBufferPreviews(*buffer_);
@@ -877,13 +889,13 @@ void BufferView::Pimpl::trackChanges()
                // We cannot allow undos beyond the freeze point
                buffer_->undostack().clear();
        } else {
-               update();
-               bv_->text()->setCursor(cursor_, 0, 0);
-#ifdef WITH_WARNINGS
-#warning changes FIXME
-#endif
+               cursor_.setCursor(doc_iterator_begin(buffer_->inset()));
                bool const found = lyx::find::findNextChange(bv_);
                if (found) {
+                       // We reset the cursor to the start of the
+                       // document, since the Changes Dialog is going
+                       // to search for the next change anyway.
+                       cursor_.setCursor(doc_iterator_begin(buffer_->inset()));
                        owner_->getDialogs().show("changes");
                        return;
                }