diff options
| -rw-r--r-- | subsurface-core/imagedownloader.cpp | 13 | ||||
| -rw-r--r-- | subsurface-core/imagedownloader.h | 1 |
2 files changed, 12 insertions, 2 deletions
diff --git a/subsurface-core/imagedownloader.cpp b/subsurface-core/imagedownloader.cpp index d28ec9503..daa49eadf 100644 --- a/subsurface-core/imagedownloader.cpp +++ b/subsurface-core/imagedownloader.cpp @@ -24,6 +24,7 @@ ImageDownloader::~ImageDownloader() void ImageDownloader::load(bool fromHash){ QUrl url; + loadFromHash = fromHash; if(fromHash) url = cloudImageURL(picture->hash); else @@ -45,8 +46,11 @@ void ImageDownloader::saveImage(QNetworkReply *reply) QByteArray imageData = reply->readAll(); QImage image = QImage(); image.loadFromData(imageData); - if (image.isNull()) + if (image.isNull()) { + if (loadFromHash) + load(false); return; + } QCryptographicHash hash(QCryptographicHash::Sha1); hash.addData(imageData); QString path = QStandardPaths::standardLocations(QStandardPaths::CacheLocation).first(); @@ -64,6 +68,11 @@ void ImageDownloader::saveImage(QNetworkReply *reply) } reply->manager()->deleteLater(); reply->deleteLater(); + // This should be called to make the picture actually show. + // Problem is DivePictureModel is not in subsurface-core. + // Nevertheless, the image shows when the dive is selected the next time. + // DivePictureModel::instance()->updateDivePictures(); + } void loadPicture(struct picture *picture, bool fromHash) @@ -74,7 +83,7 @@ void loadPicture(struct picture *picture, bool fromHash) SHashedImage::SHashedImage(struct picture *picture) : QImage() { - QUrl url = QUrl::fromUserInput(QString(picture->filename)); + QUrl url = QUrl::fromUserInput(localFilePath(QString(picture->filename))); if(url.isLocalFile()) load(url.toLocalFile()); if (isNull()) { diff --git a/subsurface-core/imagedownloader.h b/subsurface-core/imagedownloader.h index 2ff68342c..f4e3df875 100644 --- a/subsurface-core/imagedownloader.h +++ b/subsurface-core/imagedownloader.h @@ -20,6 +20,7 @@ public: private: struct picture *picture; QNetworkAccessManager manager; + bool loadFromHash; private slots: void saveImage(QNetworkReply *reply); |