summaryrefslogtreecommitdiffstats
path: root/smdirwatcher.h
diff options
context:
space:
mode:
authorArno <am@disconnect.de>2013-07-29 15:43:41 +0200
committerArno <am@disconnect.de>2013-07-29 15:43:41 +0200
commit463b159343f04bbd220d8d409b45bd368841b90f (patch)
tree4df594aef3f176edb42bef345b39a796f8c3d2a1 /smdirwatcher.h
parent06cfadc8386aec27b9c7c43486fc0b057e9fb022 (diff)
downloadSheMov-463b159343f04bbd220d8d409b45bd368841b90f.tar.gz
SheMov-463b159343f04bbd220d8d409b45bd368841b90f.tar.bz2
SheMov-463b159343f04bbd220d8d409b45bd368841b90f.zip
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.
Diffstat (limited to 'smdirwatcher.h')
-rw-r--r--smdirwatcher.h4
1 files changed, 1 insertions, 3 deletions
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<QPair<QString, SmDirWatcher::DWEvent> > *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;
};