From e18f6c36733b206167470619bf97040fa4a3b99f Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Wed, 1 Jan 2014 12:24:25 +0100
Subject: reload profile combobox at appropriate time and place

---
 facetracknoir/facetracknoir.cpp | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/facetracknoir/facetracknoir.cpp b/facetracknoir/facetracknoir.cpp
index 2006f831..6e97080d 100644
--- a/facetracknoir/facetracknoir.cpp
+++ b/facetracknoir/facetracknoir.cpp
@@ -262,6 +262,7 @@ void FaceTrackNoIR::open() {
             QSettings settings("opentrack");
             settings.setValue ("SettingsFile", QFileInfo(fileName).absoluteFilePath());
         }
+        fill_profile_cbx();
 		loadSettings();
     }
 }
@@ -587,10 +588,6 @@ void FaceTrackNoIR::fill_profile_cbx()
     ui.iconcomboProfile->clear();
     for ( int i = 0; i < iniFileList.size(); i++) {
         ui.iconcomboProfile->addItem(QIcon(":/images/settings16.png"), iniFileList.at(i));
-        if (iniFileList.at(i) == pathInfo.fileName()) {
-            ui.iconcomboProfile->setItemIcon(i, QIcon(":/images/settingsopen16.png"));
-            ui.iconcomboProfile->setCurrentIndex( i );
-        }
     }
     looping = false;
 }
@@ -602,11 +599,6 @@ void FaceTrackNoIR::profileSelected(int index)
     QFileInfo pathInfo ( currentFile );
     settings.setValue ("SettingsFile", pathInfo.absolutePath() + "/" + ui.iconcomboProfile->itemText(index));
 	loadSettings();
-    if (looping)
-        return;
-    looping = true;
-    fill_profile_cbx();
-    looping = false;
 }
 
 #if !defined(_WIN32)
-- 
cgit v1.2.3