From 464cb73809b73f533d4ddc401425484b890b170c Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Mon, 13 Jan 2014 09:38:44 +0100 Subject: pt: protect against pthread starvation when stopping --- FTNoIR_Tracker_PT/ftnoir_tracker_pt.cpp | 4 ++-- FTNoIR_Tracker_PT/ftnoir_tracker_pt.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'FTNoIR_Tracker_PT') diff --git a/FTNoIR_Tracker_PT/ftnoir_tracker_pt.cpp b/FTNoIR_Tracker_PT/ftnoir_tracker_pt.cpp index 39825168..d15e13f8 100644 --- a/FTNoIR_Tracker_PT/ftnoir_tracker_pt.cpp +++ b/FTNoIR_Tracker_PT/ftnoir_tracker_pt.cpp @@ -45,13 +45,13 @@ Tracker::~Tracker() void Tracker::set_command(Command command) { - QMutexLocker lock(&mutex); + //QMutexLocker lock(&mutex); commands |= command; } void Tracker::reset_command(Command command) { - QMutexLocker lock(&mutex); + //QMutexLocker lock(&mutex); commands &= ~command; } diff --git a/FTNoIR_Tracker_PT/ftnoir_tracker_pt.h b/FTNoIR_Tracker_PT/ftnoir_tracker_pt.h index 067a4072..1f6efce1 100644 --- a/FTNoIR_Tracker_PT/ftnoir_tracker_pt.h +++ b/FTNoIR_Tracker_PT/ftnoir_tracker_pt.h @@ -65,7 +65,7 @@ protected: }; void set_command(Command command); void reset_command(Command command); - int commands; + volatile int commands; CVCamera camera; FrameRotation frame_rotation; -- cgit v1.2.3