Clean up previous selections with empty searchstr on instant

diff --git a/src/frontends/qt/GuiSearch.cpp b/src/frontends/qt/GuiSearch.cpp
index a9b93d8af0c9fa26cb94f0e206a99ede9dead2c2..0eeaf8dd7532cd1759bbb9c312c5326b2385aabe 100644 (file)
--- a/src/frontends/qt/GuiSearch.cpp
+++ b/src/frontends/qt/GuiSearch.cpp
@@ -193,7 +193,7 @@ void GuiSearchWidget::findChanged()
        replacePB->setEnabled(replace);
        replacePrevPB->setEnabled(replace);
        replaceallPB->setEnabled(replace);
-       if (instantSearchCB->isChecked() && !emptytext)
+       if (instantSearchCB->isChecked())
                doFind(false, true);
 }
 

diff --git a/src/lyxfind.cpp b/src/lyxfind.cpp
index 50c3381e6dfd62342db5de78241e24fa066c2d48..a34baa372650934aa13c742fa3712ce14f93b7e0 100644 (file)
--- a/src/lyxfind.cpp
+++ b/src/lyxfind.cpp
@@ -279,6 +279,15 @@ bool findOne(BufferView * bv, docstring const & searchstr,
             bool find_del, bool check_wrap, bool auto_wrap,
             bool instant, bool onlysel)
 {
+       // Clean up previous selections with empty searchstr on instant
+       if (searchstr.empty() && instant) {
+               if (bv->cursor().selection()) {
+                       bv->setCursor(bv->cursor().selectionBegin());
+                       bv->clearSelection();
+               }
+               return false;
+       }
+
        if (!searchAllowed(searchstr))
                return false;