From 1e3700c11fc58801f78ac8fd94a672a7af2238b5 Mon Sep 17 00:00:00 2001
From: Dirk Hohndel <dirk@hohndel.org>
Date: Tue, 10 Mar 2015 10:22:34 -0700
Subject: Don't call UI functions from helper code

This may seem much more complicated but actually is much cleaner. Add each
thread we start to the list of future results and add a new UI function
that updates the UI once all of the threads have finished.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
---
 qt-ui/divepicturewidget.cpp | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'qt-ui/divepicturewidget.cpp')

diff --git a/qt-ui/divepicturewidget.cpp b/qt-ui/divepicturewidget.cpp
index a0d209b6d..1baceeb7e 100644
--- a/qt-ui/divepicturewidget.cpp
+++ b/qt-ui/divepicturewidget.cpp
@@ -4,6 +4,7 @@
 #include "divelist.h"
 #include <QtConcurrentMap>
 #include <QtConcurrentRun>
+#include <QFuture>
 #include <QDir>
 #include <QCryptographicHash>
 #include <mainwindow.h>
@@ -53,6 +54,14 @@ SPixmap scaleImages(picturepointer picture)
 	return ret;
 }
 
+void DivePictureModel::updateDivePicturesWhenDone(QList<QFuture<void> > futures)
+{
+	Q_FOREACH (QFuture<void> f, futures) {
+		f.waitForFinished();
+	}
+	updateDivePictures();
+}
+
 void DivePictureModel::updateDivePictures()
 {
 	if (numberOfPictures != 0) {
-- 
cgit v1.2.3-70-g09d2