From fa58baa2bb84fe51a6b835c72a92a7a9050cbf73 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Mon, 20 Jul 2015 13:25:05 +0200 Subject: cleanup invalid recursive mutex acquisitions --- ftnoir_tracker_pt/ftnoir_tracker_pt_dialog.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/ftnoir_tracker_pt/ftnoir_tracker_pt_dialog.cpp b/ftnoir_tracker_pt/ftnoir_tracker_pt_dialog.cpp index ef680ff4..40262893 100644 --- a/ftnoir_tracker_pt/ftnoir_tracker_pt_dialog.cpp +++ b/ftnoir_tracker_pt/ftnoir_tracker_pt_dialog.cpp @@ -90,10 +90,7 @@ TrackerDialog_PT::TrackerDialog_PT() void TrackerDialog_PT::camera_settings() { if (tracker) - { - QMutexLocker l(&tracker->camera_mtx); open_camera_settings(static_cast(tracker->camera), s.camera_name, &tracker->camera_mtx); - } else open_camera_settings(nullptr, s.camera_name, nullptr); } @@ -129,7 +126,6 @@ void TrackerDialog_PT::poll_tracker_info() QString to_print; CamInfo info; { - QMutexLocker l(&tracker->camera_mtx); // display caminfo tracker->get_cam_info(&info); to_print = QString::number(info.res_x)+"x"+QString::number(info.res_y)+" @ "+QString::number(info.fps)+" FPS"; -- cgit v1.2.3