Fix memory leaks with multiple windows and crash when deleteOnClose is set.

[lyx.git] / src / frontends / qt4 / QLPopupMenu.C

diff --git a/src/frontends/qt4/QLPopupMenu.C b/src/frontends/qt4/QLPopupMenu.C
index c7becf343cf2c8cb0434c15f93c75e390c308662..03c221ff507bbf2ee405d1d975087584c3a33996 100644 (file)
--- a/src/frontends/qt4/QLPopupMenu.C
+++ b/src/frontends/qt4/QLPopupMenu.C
@@ -23,7 +23,6 @@
 #include "qt_helpers.h"
 #include "MenuBackend.h"
 
-#include "frontends/lyx_gui.h"
 #include "support/lstrings.h"
 #include "debug.h"
 
@@ -31,7 +30,6 @@
 #ifdef Q_WS_MACX
 #include "kbmap.h"
 #include "QLyXKeySym.h"
-extern boost::scoped_ptr<kb_keymap> toplevel_keymap;
 #endif
 
 using std::make_pair;
@@ -74,6 +72,9 @@ void QLPopupMenu::update()
        if (name_.empty())
                return;
 
+       // Here, We make sure that theLyXFunc points to the correct LyXView.
+       theLyXFunc().setLyXView(owner_->view());
+
        Menu const & fromLyxMenu = owner_->backend().getMenu(name_);
        owner_->backend().expand(fromLyxMenu, topLevelMenu_, owner_->view()->buffer());