From 602955096732bcd652d5d26129e39eba63630f93 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Wed, 10 Apr 2013 04:20:17 +0200 Subject: Fix Linux build --- facetracknoir/facetracknoir.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'facetracknoir/facetracknoir.cpp') diff --git a/facetracknoir/facetracknoir.cpp b/facetracknoir/facetracknoir.cpp index 8940588e1..5851a8595 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. -- cgit v1.2.3 From 7e45559ab1f2c5ae048a3639417e65edcf4428d4 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Thu, 11 Apr 2013 18:26:57 +0200 Subject: Fix old regression when creating/loading a profile --- facetracknoir/facetracknoir.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'facetracknoir/facetracknoir.cpp') diff --git a/facetracknoir/facetracknoir.cpp b/facetracknoir/facetracknoir.cpp index 5851a8595..2fb07baad 100644 --- a/facetracknoir/facetracknoir.cpp +++ b/facetracknoir/facetracknoir.cpp @@ -566,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) @@ -1321,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... // -- cgit v1.2.3