summaryrefslogtreecommitdiffhomepage
path: root/FTNoIR_Tracker_PT/ftnoir_tracker_pt.h
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2014-06-12 03:51:52 +0200
committerStanislaw Halik <sthalik@misaki.pl>2014-06-12 03:51:52 +0200
commitf0790cee70bb95209f42ea54e2a96f17b02110d6 (patch)
tree1dc80f24eb136fbecff59768b082d941c2209a45 /FTNoIR_Tracker_PT/ftnoir_tracker_pt.h
parent7454496476ba17ea622781d280606161581c9544 (diff)
Fix lock order reversal
Diffstat (limited to 'FTNoIR_Tracker_PT/ftnoir_tracker_pt.h')
-rw-r--r--FTNoIR_Tracker_PT/ftnoir_tracker_pt.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/FTNoIR_Tracker_PT/ftnoir_tracker_pt.h b/FTNoIR_Tracker_PT/ftnoir_tracker_pt.h
index 47a9987b..190ed76a 100644
--- a/FTNoIR_Tracker_PT/ftnoir_tracker_pt.h
+++ b/FTNoIR_Tracker_PT/ftnoir_tracker_pt.h
@@ -25,6 +25,7 @@
#include <QMutexLocker>
#include <QTime>
#include <opencv2/opencv.hpp>
+#include <atomic>
#ifndef OPENTRACK_API
# include <boost/shared_ptr.hpp>
#else
@@ -82,10 +83,10 @@ protected:
PTVideoWidget* video_widget;
QFrame* video_frame;
- bool tracking_valid, need_apply;
+ bool tracking_valid;
settings s;
- settings* new_settings;
+ std::atomic<settings*> new_settings;
Timer time;
};