Merge remote-tracking branch 'gerrit/5.4' into dev

Change-Id: I784619fd03371ec90e42b79dbb68afdda5dc5530

2 files changed, 7 insertions, 7 deletions

diff --git a/src/plugins/geoservices/nokia/qgeocodereply_nokia.cpp b/src/plugins/geoservices/nokia/qgeocodereply_nokia.cpp
index 7aaa6bd5..c4b04ece 100644
--- a/src/plugins/geoservices/nokia/qgeocodereply_nokia.cpp
+++ b/src/plugins/geoservices/nokia/qgeocodereply_nokia.cpp
@@ -71,8 +71,10 @@ QGeoCodeReplyNokia::~QGeoCodeReplyNokia()
 
 void QGeoCodeReplyNokia::abort()
 {
-    if (!m_reply && !m_parsing)
+    if (!m_reply) {
+        m_parsing = false;
         return;
+    }
 
     m_reply->abort();
 
diff --git a/src/plugins/geoservices/osm/qgeocodereplyosm.cpp b/src/plugins/geoservices/osm/qgeocodereplyosm.cpp
index 6c880d2d..5823a179 100644
--- a/src/plugins/geoservices/osm/qgeocodereplyosm.cpp
+++ b/src/plugins/geoservices/osm/qgeocodereplyosm.cpp
@@ -79,6 +79,7 @@ void QGeoCodeReplyOsm::networkReplyFinished()
     if (m_reply->error() != QNetworkReply::NoError)
         return;
 
+    QList<QGeoLocation> locations;
     QJsonDocument document = QJsonDocument::fromJson(m_reply->readAll());
 
     if (document.isObject()) {
@@ -105,16 +106,12 @@ void QGeoCodeReplyOsm::networkReplyFinished()
         location.setCoordinate(coordinate);
         location.setAddress(address);
 
-        QList<QGeoLocation> locations;
         locations.append(location);
 
         setLocations(locations);
-        setFinished(true);
     } else if (document.isArray()) {
         QJsonArray results = document.array();
 
-        QList<QGeoLocation> locations;
-
         for (int i = 0; i < results.count(); ++i) {
             if (!results.at(i).isObject())
                 continue;
@@ -157,10 +154,11 @@ void QGeoCodeReplyOsm::networkReplyFinished()
             locations.append(location);
         }
 
-        setLocations(locations);
-        setFinished(true);
     }
 
+    setLocations(locations);
+    setFinished(true);
+
     m_reply->deleteLater();
     m_reply = 0;
 }