From c6d4e2b9c691c1d34b70c1bc378c7390d8f23cbf Mon Sep 17 00:00:00 2001 From: Abdelrazak Younes Date: Wed, 15 Mar 2006 15:26:21 +0000 Subject: [PATCH] removed topLevelMenu_.clear() call in QLPopupMenu::update() following MenuBackend change. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13380 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/qt4/ChangeLog | 4 ++++ src/frontends/qt4/QLPopupMenu.C | 3 +-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/frontends/qt4/ChangeLog b/src/frontends/qt4/ChangeLog index a612cc80ae..e33ead8d42 100644 --- a/src/frontends/qt4/ChangeLog +++ b/src/frontends/qt4/ChangeLog @@ -1,3 +1,7 @@ +2006-03-15 Abdelrazak Younes + + * QLPopupMenu.C: removed topLevelMenu_.clear() call. + 2006-03-15 Georg Baum * qfont_loader.C (isChosenFont): Xft-enabled Qt 4.1 seems to call diff --git a/src/frontends/qt4/QLPopupMenu.C b/src/frontends/qt4/QLPopupMenu.C index 9c3409e937..da42cbf518 100644 --- a/src/frontends/qt4/QLPopupMenu.C +++ b/src/frontends/qt4/QLPopupMenu.C @@ -70,8 +70,7 @@ void QLPopupMenu::update() lyxerr[Debug::GUI] << "\tTriggered menu: " << name_ << endl; clear(); - topLevelMenu_.clear(); - + if (name_.empty()) return;