summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2013-10-22 01:52:22 +0200
committerStanislaw Halik <sthalik@misaki.pl>2013-10-22 01:52:22 +0200
commit245f909db8ab5549ae2e08e39178a4c7463419ef (patch)
tree3606ccffe21cb40042f44b38db110c9bb3c532e7
parentfedee5430656657e4c9fff3ab21927c4323007ce (diff)
fix race
Signed-off-by: Stanislaw Halik <sthalik@misaki.pl>
-rw-r--r--FTNoIR_Tracker_PT/ftnoir_tracker_pt.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/FTNoIR_Tracker_PT/ftnoir_tracker_pt.cpp b/FTNoIR_Tracker_PT/ftnoir_tracker_pt.cpp
index 745d98e9..43ecc775 100644
--- a/FTNoIR_Tracker_PT/ftnoir_tracker_pt.cpp
+++ b/FTNoIR_Tracker_PT/ftnoir_tracker_pt.cpp
@@ -30,11 +30,6 @@ Tracker::Tracker()
tracking_valid(false)
{
qDebug()<<"Tracker::Tracker";
- TrackerSettings settings;
- settings.load_ini();
- apply(settings);
- camera.start();
- start();
}
Tracker::~Tracker()
@@ -207,6 +202,11 @@ void Tracker::Initialize(QFrame *video_frame)
video_frame->setAttribute(Qt::WA_NativeWindow);
video_frame->show();
update_show_video_widget();
+ TrackerSettings settings;
+ settings.load_ini();
+ apply(settings);
+ camera.start();
+ start();
}
void Tracker::refreshVideo()