Merge pull request eclipse-iceoryx#1827 from JakubSosnovec/iox-1826-u…

…se-default-roudi-config-file iox-eclipse-iceoryx#1826 Use default roudi config file
tobiasblass · Dec 15, 2022 · ac127fe · ac127fe
2 parents 928a7e6 + 3de304f
commit ac127fe
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/doc/website/release-notes/iceoryx-unreleased.md b/doc/website/release-notes/iceoryx-unreleased.md
@@ -60,6 +60,7 @@
 - CI uses outdated clang-format [\#1736](https://github.com/eclipse-iceoryx/iceoryx/issues/1736)
 - Avoid UB when accessing `iox::expected` [\#1750](https://github.com/eclipse-iceoryx/iceoryx/issues/1750)
 - Fix double move in `vector::emplace` [\#1823](https://github.com/eclipse-iceoryx/iceoryx/issues/1823)
+- Default roudi_config.toml path is not used [\#1826](https://github.com/eclipse-iceoryx/iceoryx/issues/1826)
 
 **Refactoring:**
 

diff --git a/iceoryx_posh/source/roudi/roudi_config_toml_file_provider.cpp b/iceoryx_posh/source/roudi/roudi_config_toml_file_provider.cpp
@@ -1,5 +1,6 @@
 // Copyright (c) 2019 by Robert Bosch GmbH. All rights reserved.
 // Copyright (c) 2022 by Apex AI Inc. All rights reserved.
+// Copyright (c) 2022 by NXP. All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -50,7 +51,10 @@ TomlRouDiConfigFileProvider::TomlRouDiConfigFileProvider(config::CmdLineArgs_t&
                           << "'. Falling back to built-in config.";
             }
         }
-        m_customConfigFilePath = cmdLineArgs.configFilePath;
+        else
+        {
+            m_customConfigFilePath = cmdLineArgs.configFilePath;
+        }
     }
 }