mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Copy picture struct for worker thread

Browse source 
This copies the picture struct when delegating image handling
to a worker thread to prevent a crashe when main thread
frees the picture upon selecting a different dive.

Signed-off-by: Robert C. Helling <helling@atdotde.de>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Robert C. Helling 2016-03-16 00:29:28 +01:00 • committed by Dirk Hohndel
parent 2368f3371b
commit 2639281354
5 changed files with 36 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

12
qthelper.cpp
View file

@ -1182,9 +1182,11 @@ void learnHash(struct picture *picture, QByteArray hash)
QString localFilePath(const QString originalFilename)
{
if (hashOf.contains(originalFilename) && localFilenameOf.contains(hashOf[originalFilename]))
return localFilenameOf[hashOf[originalFilename]];
else
if (hashOf.contains(originalFilename))
if (localFilenameOf.contains(hashOf[originalFilename]))
if (localFilenameOf[hashOf[originalFilename]] != "")
return localFilenameOf[hashOf[originalFilename]];
return originalFilename;
}
@ -1200,6 +1202,7 @@ void updateHash(struct picture *picture) {
char *old = picture->hash;
picture->hash = strdup(hash.toHex());
free(old);
picture_free(picture);
}
void hashPicture(struct picture *picture)
@ -1209,13 +1212,14 @@ void hashPicture(struct picture *picture)
if (!same_string(picture->hash, "") && !same_string(picture->hash, oldHash))
mark_divelist_changed((true));
free(oldHash);
picture_free(picture);
}
extern "C" void cache_picture(struct picture *picture)
{
QString filename = picture->filename;
if (!hashOf.contains(filename))
QtConcurrent::run(hashPicture, picture);
QtConcurrent::run(hashPicture, clone_picture(picture));
}
void learnImages(const QDir dir, int max_recursions, bool recursed)