* reset current_view_ when deleting a GuiView.

[features.git] / src / frontends / qt4 / GuiView.cpp

diff --git a/src/frontends/qt4/GuiView.cpp b/src/frontends/qt4/GuiView.cpp
index ba6b33dd0c7f6c7893996710ecffbc9c1e77f21f..51964929fa237af7bb7cc163b259c3ad7ff56adf 100644 (file)
--- a/src/frontends/qt4/GuiView.cpp
+++ b/src/frontends/qt4/GuiView.cpp
@@ -336,6 +336,10 @@ GuiView::GuiView(int id)
 
 GuiView::~GuiView()
 {
+       if (guiApp->currentView() == this)
+               guiApp->setCurrentView(0);
+       theLyXFunc().setLyXView(0);
+       
        delete &d;
 }
 
@@ -600,7 +604,7 @@ bool GuiView::event(QEvent * e)
                        setFocus();
                        return QMainWindow::event(e);
                }
-               guiApp->setCurrentView(*this);
+               guiApp->setCurrentView(this);
                if (d.current_work_area_) {
                        BufferView & bv = d.current_work_area_->bufferView();
                        connectBufferView(bv);