From ffefa511b474ed594a6a5bf5589aeae028f0bed2 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Sun, 19 Jul 2015 15:52:48 +0200 Subject: ui: prevent clobbering current profile Previously "open" always took to the topmost profile. Fixes #194 --- facetracknoir/ui.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/facetracknoir/ui.cpp b/facetracknoir/ui.cpp index 86996735..ac58cce8 100644 --- a/facetracknoir/ui.cpp +++ b/facetracknoir/ui.cpp @@ -111,8 +111,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)); @@ -186,10 +186,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); } -- cgit v1.2.3