[Marble-commits] branches/KDE/4.3/kdeedu/marble/src/lib

[Dennis Nienhüser]

SVN commit 1049435 by nienhueser:

Do not search for the same term more than once in a row. Avoids duplicated
result entries and crashes. Backport of commit 1048810
BUG: 210013
Please follow up in https://bugs.kde.org/show_bug.cgi?id=206534 for crashes related to multiple search queries running at the same time.


 M  +9 -7      MarbleRunnerManager.cpp  


--- branches/KDE/4.3/kdeedu/marble/src/lib/MarbleRunnerManager.cpp #1049434:1049435
@@ -60,15 +60,17 @@
 
 void MarbleRunnerManager::newText(QString text)
 {
-    if( text != m_lastString ) {
-        m_lastString = text;
-        qDebug() << "Creating new model";
-        MarblePlacemarkModel *model = new MarblePlacemarkModel(0);
-        emit modelChanged( model );
-        delete m_model;
-        m_model = model;
+    if( text == m_lastString ) {
+      return;
     }
 
+    m_lastString = text;
+    qDebug() << "Creating new model";
+    MarblePlacemarkModel *model = new MarblePlacemarkModel(0);
+    emit modelChanged( model );
+    delete m_model;
+    m_model = model;
+
     LatLonRunner* llrunner = new LatLonRunner;
     m_runners << dynamic_cast<MarbleAbstractRunner*>(llrunner);
     connect( llrunner, SIGNAL( runnerFinished( MarbleAbstractRunner*, QVector<GeoDataPlacemark> ) ),