iqbalrifai
/
Aegisub
mirror of https://github.com/odrling/Aegisub
1
0
Fork 0
Code Issues Releases Wiki Activity

Create the json log writer after checking for local config so it goes to the right place 

Originally committed to SVN as r6249.
This commit is contained in:
Thomas Goyne 2012-01-08 01:36:35 +00:00
parent e2d31b708e
commit 518f93f18f
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
aegisub/src/main.cpp
View File

@ -142,17 +142,14 @@ bool AegisubApp::OnInit() {
#endif #endif
// logging. // logging.
wxString path_log = StandardPaths::DecodePath("?user/log/");
wxFileName::Mkdir(path_log, 0777, wxPATH_MKDIR_FULL);
agi::log::log = new agi::log::LogSink; agi::log::log = new agi::log::LogSink;
agi::log::log->Subscribe(new agi::log::JsonEmitter(STD_STR(path_log), agi::log::log));
#ifdef _DEBUG #ifdef _DEBUG
agi::log::log->Subscribe(new agi::log::EmitSTDOUT()); agi::log::log->Subscribe(new agi::log::EmitSTDOUT());
#endif #endif
// Set config file // Set config file
StartupLog("Load configuration"); StartupLog("Load local configuration");
#ifdef __WXMSW__ #ifdef __WXMSW__
// Try loading configuration from the install dir if one exists there // Try loading configuration from the install dir if one exists there
try { try {
@ -169,6 +166,12 @@ bool AegisubApp::OnInit() {
} }
#endif #endif
StartupLog("Create log writer");
wxString path_log = StandardPaths::DecodePath("?user/log/");
wxFileName::Mkdir(path_log, 0777, wxPATH_MKDIR_FULL);
agi::log::log->Subscribe(new agi::log::JsonEmitter(STD_STR(path_log), agi::log::log));
StartupLog("Load user configuration");
try { try {
if (!config::opt) if (!config::opt)
config::opt = new agi::Options(STD_STR(StandardPaths::DecodePath("?user/config.json")), GET_DEFAULT_CONFIG(default_config)); config::opt = new agi::Options(STD_STR(StandardPaths::DecodePath("?user/config.json")), GET_DEFAULT_CONFIG(default_config));