From 8aa64afab7f3fd153d7a881e27442a78d57ec103 Mon Sep 17 00:00:00 2001
From: Wim Vriend <facetracknoir@gmail.com>
Date: Sun, 16 Dec 2012 11:33:23 +0000
Subject: Fixed some error(s) after testing INNO installer

git-svn-id: svn+ssh://svn.code.sf.net/p/facetracknoir/code@198 19e81ba0-9b1a-49c3-bd6c-561e1906d5fb
---
 FaceTrackNoIR/FaceTrackNoIR.qrc | 14 --------------
 FaceTrackNoIR/FaceTrackNoIR.ui  |  4 ++--
 FaceTrackNoIR/tracker.cpp       |  3 +++
 3 files changed, 5 insertions(+), 16 deletions(-)
 delete mode 100644 FaceTrackNoIR/FaceTrackNoIR.qrc

(limited to 'FaceTrackNoIR')

diff --git a/FaceTrackNoIR/FaceTrackNoIR.qrc b/FaceTrackNoIR/FaceTrackNoIR.qrc
deleted file mode 100644
index 60e4da7b..00000000
--- a/FaceTrackNoIR/FaceTrackNoIR.qrc
+++ /dev/null
@@ -1,14 +0,0 @@
-<RCC>
-    <qresource prefix="/">
-        <file>UIElements/Tools.png</file>
-        <file>images/Settings16.png</file>
-        <file>images/SettingsOpen16.png</file>
-        <file>UIElements/Donate.png</file>
-        <file>UIElements/Curves.png</file>
-        <file>images/rotation_DOFs.png</file>
-        <file>images/translation_DOFs.png</file>
-        <file>images/330px-6DOF_en.png</file>
-        <file>images/FaceTrackNoIR.ico</file>
-        <file>UIElements/aboutFaceTrackNoIR.png</file>
-    </qresource>
-</RCC>
diff --git a/FaceTrackNoIR/FaceTrackNoIR.ui b/FaceTrackNoIR/FaceTrackNoIR.ui
index 9b32fc89..2a478809 100644
--- a/FaceTrackNoIR/FaceTrackNoIR.ui
+++ b/FaceTrackNoIR/FaceTrackNoIR.ui
@@ -2081,8 +2081,8 @@ background:none;</string>
                   <string>Edit the Keyboard and mouse shortcuts</string>
                  </property>
                  <property name="text">
-                  <string>Short
-cuts</string>
+                  <string>Short-
+keys</string>
                  </property>
                  <property name="icon">
                   <iconset resource="FaceTrackNoIR.qrc">
diff --git a/FaceTrackNoIR/tracker.cpp b/FaceTrackNoIR/tracker.cpp
index f24ace79..251f2274 100644
--- a/FaceTrackNoIR/tracker.cpp
+++ b/FaceTrackNoIR/tracker.cpp
@@ -23,6 +23,7 @@
 *********************************************************************************/
 /*
 	Modifications (last one on top):
+		20121215 - WVR: Fixed crash after message: protocol not installed correctly... by terminating the thread.
 		20120921 - WVR: Fixed centering when no filter is selected.
 		20120917 - WVR: Added Mouse-buttons to ShortKeys.
 		20120827 - WVR: Signal tracking = false to Curve-widget(s) when quitting run(). Also when Alternative Pitch curve is used.
@@ -320,6 +321,8 @@ void Tracker::setup() {
 
 		DLL_Ok = pProtocol->checkServerInstallationOK( mainApp->winId() );
 		if (!DLL_Ok) {
+			// Trigger thread to stop
+			::SetEvent(m_StopThread);
 			QMessageBox::information(mainApp, "FaceTrackNoIR error", "Protocol is not (correctly) installed!");
 		}
 	}
-- 
cgit v1.2.3