Cleanup. Also added notes about how to fix bug 3440, which I do not propose to do...

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18525 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/BufferView.cpp b/src/BufferView.cpp
index 5695a15ab5b992c047f697a00961e0c9010ea7e5..3fdfd2b6dbdda9eab98bc2738af6e0186ebeb51f 100644 (file)
--- a/src/BufferView.cpp
+++ b/src/BufferView.cpp
@@ -183,14 +183,20 @@ void BufferView::setBuffer(Buffer * b)
                return;
        }
 
+       //FIXME Fix for bug 3440 is here.
        // If we are closing current buffer, switch to the first in
        // buffer list.
        if (!b) {
                LYXERR(Debug::INFO) << BOOST_CURRENT_FUNCTION
                                    << " No Buffer!" << endl;
                // We are closing the buffer, use the first buffer as current
+               //FIXME 3440
+               // if (last_buffer_) buffer_ = last_buffer_;
+               // also check that this is in theBufferList()?
                buffer_ = theBufferList().first();
        } else {
+               //FIXME 3440
+               // last_buffer = buffer_;
                // Set current buffer
                buffer_ = b;
        }
@@ -200,9 +206,11 @@ void BufferView::setBuffer(Buffer * b)
        anchor_ref_ = 0;
        offset_ref_ = 0;
 
-       if (buffer_) {
+       if (!buffer_)
+               return;
+       
                LYXERR(Debug::INFO) << BOOST_CURRENT_FUNCTION
-                                   << "Buffer addr: " << buffer_ << endl;
+                                   << "Buffer addr: " << buffer_ << endl;
                cursor_.push(buffer_->inset());
                cursor_.resetAnchor();
                buffer_->text().setCurrentFont(cursor_);
@@ -220,12 +228,8 @@ void BufferView::setBuffer(Buffer * b)
                        // example if this Buffer has been modified by another view.
                        cursor_.fixIfBroken();
                }
-       }
-
-       if (buffer_)
                updateMetrics(false);    
-
-       if (buffer_ && graphics::Previews::status() != LyXRC::PREVIEW_OFF)
+       if (graphics::Previews::status() != LyXRC::PREVIEW_OFF)
                graphics::Previews::get().generateBufferPreviews(*buffer_);
 }