diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2016-01-06 21:12:52 +0100 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2016-01-06 21:12:52 +0100 |
| commit | 54cbbf7680d7f035c101784ff5c3cfff276b24a5 (patch) | |
| tree | 44da9a27035780c6fb42f479d48493833a3944f9 | |
| parent | 313716afe8bdad772dbfb80108103a8ad3402402 (diff) | |
| parent | f36c13846be43cd54f3000cb48a04d02da1d8730 (diff) | |
Merge branch 'unstable' into trackhat
* unstable:
tracker/pt: fix crash
| -rw-r--r-- | tracker-pt/ftnoir_tracker_pt.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/tracker-pt/ftnoir_tracker_pt.cpp b/tracker-pt/ftnoir_tracker_pt.cpp index a85e3bc0..8192a76d 100644 --- a/tracker-pt/ftnoir_tracker_pt.cpp +++ b/tracker-pt/ftnoir_tracker_pt.cpp @@ -32,9 +32,13 @@ Tracker_PT::~Tracker_PT() { set_command(ABORT); wait(); - delete video_widget; + if (video_widget) + delete video_widget; video_widget = NULL; - if (video_frame->layout()) delete video_frame->layout(); + if (video_frame) + { + if (video_frame->layout()) delete video_frame->layout(); + } // fast start/stop causes breakage portable::sleep(1000); camera.stop(); |