From d0a854cd1c4fa356efc61b246a3ee78f9f6e799a Mon Sep 17 00:00:00 2001
From: Mirko Waechter <mirko.waechter@kit.edu>
Date: Wed, 13 Jul 2016 18:21:00 +0200
Subject: [PATCH] fixed: use case dialog appears even if config file was given
---
.../applications/ArmarXGui/ArmarXMainWindow.cpp | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/source/ArmarXGui/applications/ArmarXGui/ArmarXMainWindow.cpp b/source/ArmarXGui/applications/ArmarXGui/ArmarXMainWindow.cpp
index c9470de0..7bcb6bf2 100644
--- a/source/ArmarXGui/applications/ArmarXGui/ArmarXMainWindow.cpp
+++ b/source/ArmarXGui/applications/ArmarXGui/ArmarXMainWindow.cpp
@@ -170,8 +170,11 @@ ArmarXMainWindow::ArmarXMainWindow(const armarx::ManagedIceObjectRegistryInterfa
-
- if (!mainSettings.value("DoNotShowUseCaseDialog").toBool() && guiUseCaseSelector->exec() == QDialog::Accepted)
+ if (!configToLoad.isEmpty())
+ {
+ loadGuiConfig(configToLoad);
+ }
+ else if (!mainSettings.value("DoNotShowUseCaseDialog").toBool() && guiUseCaseSelector->exec() == QDialog::Accepted)
{
QString path = guiUseCaseSelector->getSelectedConfigFilePath();
ARMARX_INFO << VAROUT(path);
@@ -180,10 +183,6 @@ ArmarXMainWindow::ArmarXMainWindow(const armarx::ManagedIceObjectRegistryInterfa
loadGuiConfig(path, false);
}
}
- else if (!configToLoad.isEmpty())
- {
- loadGuiConfig(configToLoad);
- }
else if (recentlyFiles.size() > 0 && mainSettings.value(CONFIG_LOAD_LAST_CONFIG).toBool())
{
//set to false in case a plugin crashes the gui
--
GitLab