ctrl-k should not perform a new search in locator

qgis · Apr 4, 2020 · 9d09998 · 9d09998
1 parent 596dbdb
commit 9d09998
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/src/gui/locator/qgslocatorwidget.cpp b/src/gui/locator/qgslocatorwidget.cpp
@@ -144,18 +144,19 @@ void QgsLocatorWidget::setMapCanvas( QgsMapCanvas *canvas )
 
 void QgsLocatorWidget::search( const QString &string )
 {
+  window()->activateWindow(); // window must also be active - otherwise floating docks can steal keystrokes
   if ( string.isEmpty() )
   {
+    mLineEdit->setFocus();
     mLineEdit->selectAll();
   }
   else
   {
+    scheduleDelayedPopup();
+    mLineEdit->setFocus();
     mLineEdit->setText( string );
+    performSearch();
   }
-  window()->activateWindow(); // window must also be active - otherwise floating docks can steal keystrokes
-  scheduleDelayedPopup();
-  mLineEdit->setFocus();
-  performSearch();
 }
 
 void QgsLocatorWidget::invalidateResults()