Merge pull request #2956 from RaphaelCojocaru/105301-FindBug

fix #105301: Solved the Find function bug; now the searchComboBox sav…
musescore · Feb 14, 2017 · b1550be · b1550be
2 parents c2ffa9c + e930dab
commit b1550be
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/mscore/musescore.cpp b/mscore/musescore.cpp
@@ -2873,6 +2873,9 @@ bool MuseScore::eventFilter(QObject *obj, QEvent *event)
                   {
                   QKeyEvent* e = static_cast<QKeyEvent*>(event);
                   if(obj->isWidgetType() && e->key() == Qt::Key_Escape && e->modifiers() == Qt::NoModifier) {
+                        // Close the search dialog when Escape is pressed:
+                        if(_searchDialog != 0)
+                              endSearch();
                         if (isActiveWindow()) {
                               obj->event(e);
                               if(currentScoreView())
@@ -5224,8 +5227,7 @@ void MuseScore::showSearchDialog()
 
             qDebug("Line edit %p", searchCombo->lineEdit());
 
-            // does not work: connect(searchCombo->lineEdit(), SIGNAL(returnPressed()), SLOT(endSearch()));
-            connect(searchCombo->lineEdit(), SIGNAL(editingFinished()), SLOT(endSearch()));
+            connect(searchCombo->lineEdit(), SIGNAL(returnPressed()), SLOT(endSearch()));
             }
 
       searchCombo->clearEditText();