1
0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-20 15:40:32 +00:00

Merge branch 'log_setup' into 'master'

Setup logging before loading settings

See merge request OpenMW/openmw!2866
This commit is contained in:
psi29a 2023-03-27 10:30:48 +00:00
commit 954e5884c3

View File

@ -70,10 +70,8 @@ bool parseOptions(int argc, char** argv, OMW::Engine& engine, Files::Configurati
}
cfgMgr.readConfiguration(variables, desc);
Settings::Manager::load(cfgMgr);
setupLogging(cfgMgr.getLogPath(), "OpenMW");
MWGui::DebugWindow::startLogRecording();
Version::Version v
= Version::getOpenmwVersion(variables["resources"]
@ -82,6 +80,10 @@ bool parseOptions(int argc, char** argv, OMW::Engine& engine, Files::Configurati
// MSVC 14.26 due to implementation bugs.
Log(Debug::Info) << v.describe();
Settings::Manager::load(cfgMgr);
MWGui::DebugWindow::startLogRecording();
engine.setGrabMouse(!variables["no-grab"].as<bool>());
// Font encoding settings