diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2013-11-10 22:49:36 +0100 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2013-11-10 22:49:36 +0100 |
| commit | 3dbd4228b5823b72dd095ceaeada878a2b9a5dac (patch) | |
| tree | 8c13a62174cdae098c0afdc789aebca37a32390d | |
| parent | 693e922e82914f6ea5e2184c5487af1e1b4881b8 (diff) | |
hopefully fix macosx aruco freeze now
Signed-off-by: Stanislaw Halik <sthalik@misaki.pl>
| -rw-r--r-- | ftnoir_tracker_aruco/ftnoir_tracker_aruco.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ftnoir_tracker_aruco/ftnoir_tracker_aruco.cpp b/ftnoir_tracker_aruco/ftnoir_tracker_aruco.cpp index ab27d7c6..a4c521d0 100644 --- a/ftnoir_tracker_aruco/ftnoir_tracker_aruco.cpp +++ b/ftnoir_tracker_aruco/ftnoir_tracker_aruco.cpp @@ -135,9 +135,9 @@ void Tracker::load_settings() Tracker::Tracker() { + layout = nullptr; stop = false; videoWidget = NULL; - layout = NULL; enableRX = enableRY = enableRZ = enableTX = enableTY = enableTZ = true; load_settings(); } @@ -147,10 +147,10 @@ Tracker::~Tracker() QMutexLocker foo(&mtx); stop = true; wait(); - if (layout) - delete layout; if (videoWidget) delete videoWidget; + if(layout) + delete layout; } void Tracker::StartTracker(QFrame* videoframe) @@ -165,11 +165,11 @@ void Tracker::StartTracker(QFrame* videoframe) delete videoframe->layout(); videoframe->setLayout(layout); videoWidget->show(); - this->layout = layout; load_settings(); start(); for (int i = 0; i < 6; i++) pose[i] = 0; + this->layout = layout; } #define HT_PI 3.1415926535 |