add Mutex for cancel anaylsis action

labsquare · Apr 22, 2017 · f0a9f1e · f0a9f1e
1 parent caa54a2
commit f0a9f1e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/analysis/analysisrunner.cpp b/analysis/analysisrunner.cpp
@@ -118,7 +118,7 @@ void AnalysisRunner::run()
             a->before();
 
 
-        while (reader.next() && !mCancel)
+        while (reader.next() && !isCanceled())
         {
 
             // check if first sequence is valid..Means it's probably a good file
@@ -217,10 +217,17 @@ int AnalysisRunner::sequenceCount() const
 
 void AnalysisRunner::cancel()
 {
+    QMutexLocker locker(&mMutex);
     mCancel = true;
     mStatus = Canceled;
 }
 
+bool AnalysisRunner::isCanceled()
+{
+    QMutexLocker locker(&mMutex);
+    return mCancel;
+}
+
 qint64 AnalysisRunner::fileSize() const
 {
     return mFileSize;

diff --git a/analysis/analysisrunner.h b/analysis/analysisrunner.h
@@ -89,6 +89,7 @@ class AnalysisRunner : public QRunnable
     int sequenceCount() const;
 
     void cancel();
+    bool isCanceled();
 
     qint64 fileSize() const;
 
@@ -127,6 +128,7 @@ class AnalysisRunner : public QRunnable
     int mDuration  = 0;
     Status mStatus = Waiting;
     bool mCancel = false;
+    QMutex mMutex;