From 844d9a6f4d62227fbf22e65614c84693438080bf Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Wed, 26 Aug 2015 19:55:01 +0200
Subject: ui: don't reload settings if config wasn't changed

Since combobox is reloaded on a timer, the "current" config changes all
the time.
---
 facetracknoir/ui.cpp | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

(limited to 'facetracknoir/ui.cpp')

diff --git a/facetracknoir/ui.cpp b/facetracknoir/ui.cpp
index 0befd813..3c2d8db6 100644
--- a/facetracknoir/ui.cpp
+++ b/facetracknoir/ui.cpp
@@ -70,7 +70,7 @@ MainWindow::MainWindow() :
 
     connect(ui.btnStartTracker, SIGNAL(clicked()), this, SLOT(startTracker()));
     connect(ui.btnStopTracker, SIGNAL(clicked()), this, SLOT(stopTracker()));
-    connect(ui.iconcomboProfile, SIGNAL(currentIndexChanged(int)), this, SLOT(profileSelected(int)));
+    connect(ui.iconcomboProfile, SIGNAL(currentIndexChanged(int)), this, SLOT(profileSelected(int)), Qt::QueuedConnection);
 
     connect(&pose_update_timer, SIGNAL(timeout()), this, SLOT(showHeadPose()));
     connect(&kbd_quit, SIGNAL(activated()), this, SLOT(exit()));
@@ -438,15 +438,20 @@ void MainWindow::profileSelected(int index)
 {
     if (index == -1)
         return;
-    
-    {
-        QSettings settings(OPENTRACK_ORG);
-        settings.setValue (OPENTRACK_CONFIG_FILENAME_KEY, ui.iconcomboProfile->itemText(index));
-    }
 
-    set_title();
+    const auto old_name = group::ini_filename();
+    const auto new_name = ui.iconcomboProfile->itemText(index);
 
-    load_settings();
+    if (old_name != new_name)
+    {
+        {
+            QSettings settings(OPENTRACK_ORG);
+            settings.setValue (OPENTRACK_CONFIG_FILENAME_KEY, new_name);
+        }
+
+        set_title();
+        load_settings();
+    }
 }
 
 void MainWindow::shortcutRecentered()
-- 
cgit v1.2.3