Fix reloading of local layout file (bug #11120)

[lyx.git] / src / frontends / qt4 / GuiCompleter.cpp

diff --git a/src/frontends/qt4/GuiCompleter.cpp b/src/frontends/qt4/GuiCompleter.cpp
index 9858b8d01a88166a51753bc230d3ed3d06c65980..f2e4eda81f10509af19f8e656d2ada45235a8353 100644 (file)
--- a/src/frontends/qt4/GuiCompleter.cpp
+++ b/src/frontends/qt4/GuiCompleter.cpp
@@ -538,7 +538,9 @@ void GuiCompleter::showPopup(Cursor const & cur)
 void GuiCompleter::asyncHidePopup()
 {
        popup()->hide();
-       if (!inlineVisible())
+       // do not clear model if it has been set by an event before the
+       // timeout got triggered.
+       if (!modelActive_ && !inlineVisible())
                model_->setList(0);
 }
 
@@ -573,7 +575,9 @@ void GuiCompleter::hideInline(Cursor const & cur)
 
 void GuiCompleter::asyncHideInline()
 {
-       if (!popupVisible())
+       // do not clear model if it has been set by an event before the
+       // timeout got triggered.
+       if (!modelActive_ && !popupVisible())
                model_->setList(0);
 }