From 463b159343f04bbd220d8d409b45bd368841b90f Mon Sep 17 00:00:00 2001 From: Arno Date: Mon, 29 Jul 2013 15:43:41 +0200 Subject: Revert "Prevent datacollector from running when operating on files" This reverts commit 06cfadc8386aec27b9c7c43486fc0b057e9fb022. Turns out that this was not the root cause for the crashes. Still stumped. --- smdirwatcher.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'smdirwatcher.h') diff --git a/smdirwatcher.h b/smdirwatcher.h index dcfc714..77d0d97 100644 --- a/smdirwatcher.h +++ b/smdirwatcher.h @@ -1,4 +1,4 @@ -/* + /* This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version @@ -54,7 +54,6 @@ class SmDataColletor : public QThread { public: explicit SmDataColletor(const int numFields, QObject *parent = 0); void init(QSemaphore *set, QSemaphore *get, QQueue > *data); - QMutex &hold() { return mHoldMx; } public slots: void setCheckForPresent(bool present); @@ -78,7 +77,6 @@ class SmDataColletor : public QThread { bool mCheckForPresent; bool mCancel; QMutex mCheckForPresentMx; - QMutex mHoldMx; QSqlQuery *mPicPresentQ; QSqlQuery *mMovPresentQ; }; -- cgit v1.2.3-70-g09d2