mirror of https://github.com/odrling/Aegisub
Actually load the platform config rather than the default config twice
This commit is contained in:
parent
c9608ab610
commit
13fe4fe9ff
|
@ -197,7 +197,7 @@ bool AegisubApp::OnInit() {
|
||||||
try {
|
try {
|
||||||
if (!config::opt)
|
if (!config::opt)
|
||||||
config::opt = new agi::Options(config::path->Decode("?user/config.json"), GET_DEFAULT_CONFIG(default_config));
|
config::opt = new agi::Options(config::path->Decode("?user/config.json"), GET_DEFAULT_CONFIG(default_config));
|
||||||
boost::interprocess::ibufferstream stream((const char *)default_config, sizeof(default_config));
|
boost::interprocess::ibufferstream stream((const char *)default_config_platform, sizeof(default_config_platform));
|
||||||
config::opt->ConfigNext(stream);
|
config::opt->ConfigNext(stream);
|
||||||
} catch (agi::Exception& e) {
|
} catch (agi::Exception& e) {
|
||||||
LOG_E("config/init") << "Caught exception: " << e.GetMessage();
|
LOG_E("config/init") << "Caught exception: " << e.GetMessage();
|
||||||
|
|
Loading…
Reference in New Issue