mantarimay/Aegisub
1
0
Fork 0
forked from mia/Aegisub
Code Pull requests Activity

Add missing config:: in windows-specific code and move appname setting back before config file loading

Browse source 
Originally committed to SVN as r4549.
This commit is contained in:
Thomas Goyne 2010-06-18 07:23:17 +00:00
parent cfa1758d2a
commit 363198b2fa
1 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
aegisub/src/main.cpp
View file

@ -148,6 +148,13 @@ bool AegisubApp::OnInit() {
emit_stdout->Enable(); emit_stdout->Enable();
#endif #endif
// App name (yeah, this is a little weird to get rid of an odd warning)
#if defined(__WXMSW__) || defined(__WXMAC__)
SetAppName(_T("Aegisub"));
#else
SetAppName(_T("aegisub"));
#endif
const std::string conf_mru(StandardPaths::DecodePath(_T("?user/mru.json"))); const std::string conf_mru(StandardPaths::DecodePath(_T("?user/mru.json")));
config::mru = new agi::MRUManager(conf_mru, GET_DEFAULT_CONFIG(default_mru)); config::mru = new agi::MRUManager(conf_mru, GET_DEFAULT_CONFIG(default_mru));
@ -165,7 +172,7 @@ bool AegisubApp::OnInit() {
try { try {
const std::string conf_local(StandardPaths::DecodePath(_T("?data/config.json"))); const std::string conf_local(StandardPaths::DecodePath(_T("?data/config.json")));
std::ifstream* localConfig = agi::io::Open(conf_local); std::ifstream* localConfig = agi::io::Open(conf_local);
opt->ConfigNext(*localConfig); config::opt->ConfigNext(*localConfig);
delete localConfig; delete localConfig;
if (OPT_GET("App/Local Config")->GetBool()) { if (OPT_GET("App/Local Config")->GetBool()) {
@ -187,14 +194,6 @@ bool AegisubApp::OnInit() {
StartupLog(_T("Inside OnInit")); StartupLog(_T("Inside OnInit"));
frame = NULL; frame = NULL;
try { try {
// App name (yeah, this is a little weird to get rid of an odd warning)
#if defined(__WXMSW__) || defined(__WXMAC__)
SetAppName(_T("Aegisub"));
#else
SetAppName(_T("aegisub"));
#endif
// Initialize randomizer // Initialize randomizer
StartupLog(_T("Initialize random generator")); StartupLog(_T("Initialize random generator"));
srand(time(NULL)); srand(time(NULL));