Merge branch 'OpenStarbound:main' into main

2 files changed, 6 insertions, 6 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 {
diff --git a/source/base/StarConfiguration.hpp b/source/base/StarConfiguration.hpp
index ffa66c3..4f5d97c 100644
--- a/source/base/StarConfiguration.hpp
+++ b/source/base/StarConfiguration.hpp
@@ -18,8 +18,8 @@ public:
   Json currentConfiguration() const;
   String printConfiguration() const;
 
-  Json get(String const& key) const;
-  Json getPath(String const& path) const;
+  Json get(String const& key, Json def = {}) const;
+  Json getPath(String const& path, Json def = {}) const;
 
   Json getDefault(String const& key) const;
   Json getDefaultPath(String const& path) const;