Merge branch 'unstable' into trackhat-ui

2 files changed, 3 insertions, 3 deletions

diff --git a/facetracknoir/images/facetracknoir.png b/facetracknoir/images/facetracknoir.png
index 41b54524..85c06df6 100644
--- a/facetracknoir/images/facetracknoir.png
+++ b/facetracknoir/images/facetracknoir.png
diff --git a/facetracknoir/ui.cpp b/facetracknoir/ui.cpp
index 4d74aa07..1d9f3702 100644
--- a/facetracknoir/ui.cpp
+++ b/facetracknoir/ui.cpp
@@ -101,8 +101,8 @@ void MainWindow::open() {
                 dir_path,
                 tr("Settings file (*.ini);;All Files (*)"));
     set_working_directory();
-    
-    if (! fileName.isEmpty() ) {
+
+    if (!fileName.isEmpty()) {
         {
             QSettings settings(OPENTRACK_ORG);
             settings.setValue(OPENTRACK_CONFIG_FILENAME_KEY, remove_app_path(fileName));
@@ -176,10 +176,10 @@ void MainWindow::fill_profile_combobox()
 {
      QStringList ini_list = group::ini_list();
      set_title();
+     QString current = QFileInfo(group::ini_pathname()).fileName();
      ui.iconcomboProfile->clear();
      for (auto x : ini_list)
          ui.iconcomboProfile->addItem(QIcon(":/images/settings16.png"), x);
-     QString current = QFileInfo(group::ini_pathname()).fileName();
      ui.iconcomboProfile->setCurrentText(current);
 }