|
|
@ -16,6 +16,8 @@ namespace Inferno { |
|
|
|
Settings::update(); |
|
|
|
Settings::update(); |
|
|
|
|
|
|
|
|
|
|
|
m_initialized = true; |
|
|
|
m_initialized = true; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
dbg(Log::Info) << "Settings initialized"; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
void Settings::update() |
|
|
|
void Settings::update() |
|
|
@ -50,7 +52,6 @@ namespace Inferno { |
|
|
|
nlohmann::json json; |
|
|
|
nlohmann::json json; |
|
|
|
|
|
|
|
|
|
|
|
File::ioRead(json, m_path); |
|
|
|
File::ioRead(json, m_path); |
|
|
|
dbg(Log::Info) << "Settings loaded"; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
return json; |
|
|
|
return json; |
|
|
|
} |
|
|
|
} |
|
|
|