Merge branch 'unstable' into trackhat-ui

1 files changed, 6 insertions, 5 deletions

diff --git a/facetracknoir/process_detector.cpp b/facetracknoir/process_detector.cpp
index 237d350d..8efc0c10 100644
--- a/facetracknoir/process_detector.cpp
+++ b/facetracknoir/process_detector.cpp
@@ -9,25 +9,25 @@
 
 void settings::set_game_list(const QString &game_list)
 {
-    QSettings settings(group::org);
+    QSettings settings(OPENTRACK_ORG);
     settings.setValue("executable-list", game_list);
 }
 
 QString settings::get_game_list()
 {
-    QSettings settings(group::org);
+    QSettings settings(OPENTRACK_ORG);
     return settings.value("executable-list").toString();
 }
 
 bool settings::is_enabled()
 {
-    QSettings settings(group::org);
+    QSettings settings(OPENTRACK_ORG);
     return settings.value("executable-detector-enabled", false).toBool();
 }
 
 void settings::set_is_enabled(bool enabled)
 {
-    QSettings settings(group::org);
+    QSettings settings(OPENTRACK_ORG);
     settings.setValue("executable-detector-enabled", enabled);
 }
 
@@ -68,6 +68,7 @@ int process_detector::add_row(QString exe_name, QString profile)
     
     QComboBox* cb = new QComboBox();
     cb->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Maximum);
+    cb->addItem("");
     cb->addItems(group::ini_list());
     ui.tableWidget->setCellWidget(i, 1, cb);
     
@@ -222,7 +223,7 @@ bool process_detector_worker::config_to_start(QString& str)
         {
             last_exe_name = name;
             str = filenames[name];
-            return true;
+            return str != "";
         }
     }