diff options
| -rw-r--r-- | src/plugins/geoservices/osm/qgeotiledmappingmanagerengineosm.cpp | 15 | ||||
| -rw-r--r-- | src/plugins/geoservices/osm/qgeotileproviderosm.cpp | 2 |
2 files changed, 9 insertions, 8 deletions
diff --git a/src/plugins/geoservices/osm/qgeotiledmappingmanagerengineosm.cpp b/src/plugins/geoservices/osm/qgeotiledmappingmanagerengineosm.cpp index da7b61d2..45e7efbe 100644 --- a/src/plugins/geoservices/osm/qgeotiledmappingmanagerengineosm.cpp +++ b/src/plugins/geoservices/osm/qgeotiledmappingmanagerengineosm.cpp @@ -220,15 +220,16 @@ QGeoTiledMappingManagerEngineOsm::QGeoTiledMappingManagerEngineOsm(const QVarian if (parameters.contains(QStringLiteral("osm.mapping.providersrepository.disabled"))) disableRedirection = parameters.value(QStringLiteral("osm.mapping.providersrepository.disabled")).toBool(); - foreach (QGeoTileProviderOsm * provider, m_providers) { + for (QGeoTileProviderOsm * provider: qAsConst(m_providers)) { // Providers are parented inside QGeoFileTileCacheOsm, as they are used in its destructor. - if (disableRedirection) + if (disableRedirection) { provider->disableRedirection(); - - connect(provider, &QGeoTileProviderOsm::resolutionFinished, - this, &QGeoTiledMappingManagerEngineOsm::onProviderResolutionFinished); - connect(provider, &QGeoTileProviderOsm::resolutionError, - this, &QGeoTiledMappingManagerEngineOsm::onProviderResolutionError); + } else { + connect(provider, &QGeoTileProviderOsm::resolutionFinished, + this, &QGeoTiledMappingManagerEngineOsm::onProviderResolutionFinished); + connect(provider, &QGeoTileProviderOsm::resolutionError, + this, &QGeoTiledMappingManagerEngineOsm::onProviderResolutionError); + } } updateMapTypes(); diff --git a/src/plugins/geoservices/osm/qgeotileproviderosm.cpp b/src/plugins/geoservices/osm/qgeotileproviderosm.cpp index 563ac161..a0cbd843 100644 --- a/src/plugins/geoservices/osm/qgeotileproviderosm.cpp +++ b/src/plugins/geoservices/osm/qgeotileproviderosm.cpp @@ -174,11 +174,11 @@ void QGeoTileProviderOsm::disableRedirection() if (p->isValid() && !found) { m_provider = p; m_providerId = m_providerList.indexOf(p); - m_status = Resolved; found = true; } p->disconnect(this); } + m_status = Resolved; } void QGeoTileProviderOsm::onResolutionFinished(TileProvider *provider) |