diff --git a/source/ArmarXGui/applications/ArmarXGui/ArmarXMainWindow.cpp b/source/ArmarXGui/applications/ArmarXGui/ArmarXMainWindow.cpp index c9470de0253fb01ec2ba541062bf5d08c53b6792..7bcb6bf27ccd8ed8cd5d6486bfe194843a0f4385 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