From c9bfd9b3a6fd40d8d63cb25c8d746e6a4adb532f Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Fri, 13 Sep 2013 14:02:08 +0200
Subject: Reorder side effects to avoid use-after-free

---
 facetracknoir/facetracknoir.cpp | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/facetracknoir/facetracknoir.cpp b/facetracknoir/facetracknoir.cpp
index 8224b35f..da2ce21f 100644
--- a/facetracknoir/facetracknoir.cpp
+++ b/facetracknoir/facetracknoir.cpp
@@ -765,6 +765,18 @@ void FaceTrackNoIR::stopTracker( ) {
 	ui.lcdNumOutputRotX->setVisible(false);
 	ui.lcdNumOutputRotY->setVisible(false);
 	ui.lcdNumOutputRotZ->setVisible(false);
+    
+    //
+    // UnRegister the Tracker instance with the Tracker Dialog (if open)
+    //
+    if (pTrackerDialog) {
+        pTrackerDialog->unRegisterTracker();
+    }
+    if (pProtocolDialog) {
+        pProtocolDialog->unRegisterProtocol();
+    }
+    if (pFilterDialog)
+        pFilterDialog->Initialize(this, NULL);
 
 	//
 	// Delete the tracker (after stopping things and all).
@@ -783,16 +795,6 @@ void FaceTrackNoIR::stopTracker( ) {
             Libraries = NULL;
         }
 	}
-
-    //
-    // UnRegister the Tracker instance with the Tracker Dialog (if open)
-    //
-    if (pTrackerDialog) {
-        pTrackerDialog->unRegisterTracker();
-    }
-    if (pProtocolDialog) {
-        pProtocolDialog->unRegisterProtocol();
-    }
 	ui.btnStartTracker->setEnabled ( true );
 	ui.btnStopTracker->setEnabled ( false );
 //	ui.btnShowEngineControls->setEnabled ( false );
-- 
cgit v1.2.3