Merge branch 'master' of https://github.com/ModOrganizer2/modorganizer into master

1 files changed, 13 insertions, 7 deletions

diff --git a/src/settings.cpp b/src/settings.cpp
index 99b41e1f..54d32786 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -86,14 +86,20 @@ Settings::~Settings()
   }
 }
 
-Settings &Settings::instance()
+Settings& Settings::instance()
 {
   if (s_Instance == nullptr) {
     throw std::runtime_error("no instance of \"Settings\"");
   }
+
   return *s_Instance;
 }
 
+Settings* Settings::maybeInstance()
+{
+  return s_Instance;
+}
+
 void Settings::processUpdates(
   const QVersionNumber& currentVersion, const QVersionNumber& lastVersion)
 {
@@ -2110,23 +2116,23 @@ void DiagnosticsSettings::setLootLogLevel(lootcli::LogLevels level)
   set(m_Settings, "Settings", "loot_log_level", level);
 }
 
-CrashDumpsType DiagnosticsSettings::crashDumpsType() const
+env::CoreDumpTypes DiagnosticsSettings::coreDumpType() const
 {
-  return get<CrashDumpsType>(m_Settings,
-    "Settings", "crash_dumps_type", CrashDumpsType::Mini);
+  return get<env::CoreDumpTypes>(m_Settings,
+    "Settings", "crash_dumps_type", env::CoreDumpTypes::Mini);
 }
 
-void DiagnosticsSettings::setCrashDumpsType(CrashDumpsType type)
+void DiagnosticsSettings::setCoreDumpType(env::CoreDumpTypes type)
 {
   set(m_Settings, "Settings", "crash_dumps_type", type);
 }
 
-int DiagnosticsSettings::crashDumpsMax() const
+int DiagnosticsSettings::maxCoreDumps() const
 {
   return get<int>(m_Settings, "Settings", "crash_dumps_max", 5);
 }
 
-void DiagnosticsSettings::setCrashDumpsMax(int n)
+void DiagnosticsSettings::setMaxCoreDumps(int n)
 {
   set(m_Settings, "Settings", "crash_dumps_max", n);
 }