diff options
author | WereTech <17415815+WereTech@users.noreply.github.com> | 2025-02-23 16:31:03 -0600 |
---|---|---|
committer | GitHub <noreply@github.com> | 2025-02-23 16:31:03 -0600 |
commit | 0245e639ecc51d948f0256eb4a773d42fbb8ade5 (patch) | |
tree | 7fc9b120efda129c09e522fc08af2d28e52d3eb6 /source/base/StarConfiguration.cpp | |
parent | 3108120076bad6b934c43526200f2beed4c96753 (diff) | |
parent | 5dda9f47306a6eea5eb4e676c68f81b8285d9dfe (diff) |
Merge branch 'OpenStarbound:main' into main
Diffstat (limited to 'source/base/StarConfiguration.cpp')
-rw-r--r-- | source/base/StarConfiguration.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/base/StarConfiguration.cpp b/source/base/StarConfiguration.cpp index 89ec7fa..1d888a0 100644 --- a/source/base/StarConfiguration.cpp +++ b/source/base/StarConfiguration.cpp @@ -21,14 +21,14 @@ String Configuration::printConfiguration() const { return m_currentConfig.printJson(2, true); } -Json Configuration::get(String const& key) const { +Json Configuration::get(String const& key, Json def) const { MutexLocker locker(m_mutex); - return m_currentConfig.get(key, {}); + return m_currentConfig.get(key, def); } -Json Configuration::getPath(String const& path) const { +Json Configuration::getPath(String const& path, Json def) const { MutexLocker locker(m_mutex); - return m_currentConfig.query(path, {}); + return m_currentConfig.query(path, def); } Json Configuration::getDefault(String const& key) const { |