Merge branch 'master' into map

[situare] / src / map / mapfetcher.cpp

diff --git a/src/map/mapfetcher.cpp b/src/map/mapfetcher.cpp
index a7de3f8..5818906 100644 (file)
--- a/src/map/mapfetcher.cpp
+++ b/src/map/mapfetcher.cpp
@@ -75,7 +75,11 @@ bool MapFetcher::loadImageFromCache(const QUrl &url)
 
         QNetworkCacheMetaData metaData = cache->metaData(url);
 
+<<<<<<< HEAD:src/map/mapfetcher.cpp
         if (metaData.expirationDate().isValid()) {
+=======
+        if ((metaData.expirationDate().isValid()) && (url.isValid())) {
+>>>>>>> master:src/map/mapfetcher.cpp
 
             if (metaData.expirationDate() < QDateTime::currentDateTime()) {
                 cache->remove(url);
@@ -83,7 +87,11 @@ bool MapFetcher::loadImageFromCache(const QUrl &url)
             }
         }
 
+<<<<<<< HEAD:src/map/mapfetcher.cpp
         QIODevice *cacheImage = m_manager->cache()->data(url);
+=======
+        QIODevice *cacheImage = cache->data(url);
+>>>>>>> master:src/map/mapfetcher.cpp
 
         if (cacheImage) {
             QImage image;