Merge branch 'posix' of ssh://git.code.sf.net/p/facetracknoir/codegit into posix

1 files changed, 3 insertions, 5 deletions

diff --git a/facetracknoir/facetracknoir.cpp b/facetracknoir/facetracknoir.cpp
index 8940588e..2fb07baa 100644
--- a/facetracknoir/facetracknoir.cpp
+++ b/facetracknoir/facetracknoir.cpp
@@ -376,9 +376,7 @@ QFrame *FaceTrackNoIR::get_video_widget() {
 /** read the name of the first video-capturing device at start up **/

 /** FaceAPI can only use this first one... **/

 void FaceTrackNoIR::GetCameraNameDX() {

-#if 1

-////	ui.widget->setCameraName("No video-capturing device was found in your system: check if it's connected!");

-

+#if defined(_WIN32)

 	ui.cameraName->setText("No video-capturing device was found in your system: check if it's connected!");

 

 	// Create the System Device Enumerator.

@@ -568,8 +566,6 @@ void FaceTrackNoIR::saveAs()
 // Load the current Settings from the currently 'active' INI-file.

 //

 void FaceTrackNoIR::loadSettings() {

-    if (looping)

-        return;

     looping = true;

 	qDebug() << "loadSettings says: Starting ";

 	QSettings settings("Abbequerque Inc.", "FaceTrackNoIR");	// Registry settings (in HK_USER)

@@ -1323,6 +1319,8 @@ void FaceTrackNoIR::trackingSourceSelected(int index)
 //

 void FaceTrackNoIR::profileSelected(int index)

 {

+    if (looping)

+        return;

 	//

 	// Read the current INI-file setting, to get the folder in which it's located...

 	//