diff options
| author | Alex Blasche <alexander.blasche@qt.io> | 2017-02-28 15:57:47 +0100 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@qt.io> | 2017-02-28 15:57:47 +0100 |
| commit | 461da8f31a90b3ed5e98133850f0776c5e0c2a2d (patch) | |
| tree | 756f31e38b1b4f50f842355e1d7f9e728a4c9a4e /src/plugins/geoservices/osm/qgeotileproviderosm.cpp | |
| parent | 11e6a62957433843816b41ad11fada7ca8eab85c (diff) | |
| parent | a1c8a23c52087300ffd7bf7e61bdfaab8ff6ecc9 (diff) | |
| download | qtlocation-461da8f31a90b3ed5e98133850f0776c5e0c2a2d.tar.gz | |
Merge remote-tracking branch 'gerrit/5.8' into 5.9
Change-Id: I3c27a0635fa324dfea7a1d19774a66e21c066bbe
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 1989c44f..0d617368 100644 --- a/src/plugins/geoservices/osm/qgeotileproviderosm.cpp +++ b/src/plugins/geoservices/osm/qgeotileproviderosm.cpp @@ -183,7 +183,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 |