diff options
| author | Paolo Angelelli <paolo.angelelli@qt.io> | 2017-02-28 15:05:01 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2017-02-28 15:46:39 +0000 |
| commit | 3027558cf4094c7d290731c9d819201c6d570c13 (patch) | |
| tree | 30e8ba6628cb7886f1dd6eef886196a64e07cbaa /src/plugins/geoservices/osm/qgeotileproviderosm.cpp | |
| parent | 65bd308685d6c863f4f684efa7a593d76cbdec3b (diff) | |
| parent | 461da8f31a90b3ed5e98133850f0776c5e0c2a2d (diff) | |
| download | qtlocation-3027558cf4094c7d290731c9d819201c6d570c13.tar.gz | |
Merge "Merge remote-tracking branch 'gerrit/5.8' into 5.9" into refs/staging/5.9
Diffstat (limited to 'src/plugins/geoservices/osm/qgeotileproviderosm.cpp')
| -rw-r--r-- | src/plugins/geoservices/osm/qgeotileproviderosm.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/geoservices/osm/qgeotileproviderosm.cpp b/src/plugins/geoservices/osm/qgeotileproviderosm.cpp index 1b48401c..ad8edfd5 100644 --- a/src/plugins/geoservices/osm/qgeotileproviderosm.cpp +++ b/src/plugins/geoservices/osm/qgeotileproviderosm.cpp @@ -191,7 +191,7 @@ void QGeoTileProviderOsm::onResolutionError(TileProvider *provider) { Q_UNUSED(provider) // provider and m_provider are the same at this point. m_status is Resolving. - if (m_provider->isInvalid()) { + if (!m_provider || m_provider->isInvalid()) { m_provider = nullptr; m_status = Resolved; if (m_providerId >= m_providerList.size() -1) { // no hope left |