Various Bugfixes

* cache: use qint64 consistently instead of quint64 once (typo, I guess)
* sync cancelling of ArchiveCollector: wait for it and reset the cancel
var
* sync access to cache file with QMutex
* don't set quality for pics

1 files changed, 2 insertions, 1 deletions

diff --git a/newmoviewizard.cpp b/newmoviewizard.cpp
index 9c12dca..d956540 100644
--- a/newmoviewizard.cpp
+++ b/newmoviewizard.cpp
@@ -112,7 +112,6 @@ void NewMovieWizard::accept(){
     //handle files
     MovieInfoPage *movieInfoPage = qobject_cast<MovieInfoPage*>(page(0));
     WizardTreeModel *wizardModel = movieInfoPage->model();
-    int quality = field("quality").toInt();
     QSqlQuery insertFilesQ(db);
     insertFilesQ.prepare("INSERT INTO files (iseriespart_id, tfilename, cmd5sum, bisize, sifiletype, sifileno, siquality, cpicsize, iduration) VALUES(:ipid, :tfn, :md5, :size, :ft, :fno, :qual, :psize, :dur)");
     QHash<QString, QString> md5Sums;
@@ -126,9 +125,11 @@ void NewMovieWizard::accept(){
         qint64 secs = 0;
         QString picSize;
         int type = fData.value(WizardTreeModel::FileType).toInt();
+        QVariant quality;
         if(type == ArchiveFilesModel::Movie){
             QVariantMap m = Helper::ffmpegData(fullPath);
             secs = m.value("duration").toDouble();
+            quality = field("quality").toInt();
         }else{
             QPixmap pix(fullPath);
             picSize = QString("%1x%2").arg(QString::number(pix.width())).arg(QString::number(pix.height()));