From 072237ab4b0579dc96a9597e5e276647cbb5a027 Mon Sep 17 00:00:00 2001
From: Vincent van Ravesteijn <vfr@lyx.org>
Date: Thu, 13 Aug 2009 21:32:55 +0000
Subject: [PATCH] Fix assertion that was revealed in my tree.

This really has to be QComboBox::showPopup(). Otherwise, we'll hit the LASSERT(!d->inShowPopup_, /**/); in either LayoutBox::showPopup() or LayoutBox::Private::showPopup().

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31020 a592a061-630c-0410-9148-cb99ea01b6c8
---
 src/frontends/qt4/LayoutBox.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/frontends/qt4/LayoutBox.cpp b/src/frontends/qt4/LayoutBox.cpp
index 9ebc2d4906..212b484aec 100644
--- a/src/frontends/qt4/LayoutBox.cpp
+++ b/src/frontends/qt4/LayoutBox.cpp
@@ -380,7 +380,7 @@ void LayoutBox::Private::setFilter(QString const & s)
 		// on the QComboBox.
 		LASSERT(!inShowPopup_, /**/);
 		inShowPopup_ = true;
-		p->showPopup();
+		p->QComboBox::showPopup();
 		inShowPopup_ = false;
 
 		// The item delegate hack is off again. So trigger a relayout of the popup.