thirdparty/ppsspp
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

NativeApp: Load config before processing flags (duh)

Browse source
This commit is contained in:
Henrik Rydgård 2012-12-25 08:34:19 +01:00
parent 875f3569ee
commit d56bc40db4
2 changed files with 19 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

11
android/jni/NativeApp.cpp
View file

@ -169,6 +169,10 @@ void NativeInit(int argc, const char *argv[], const char *savegame_directory, co
LogManager *logman = LogManager::GetInstance();
ILOG("Logman: %p", logman);
config_filename = user_data_path + "ppsspp.ini";
g_Config.Load(config_filename.c_str());
bool gfxLog = false;
// Parse command line
LogTypes::LOG_LEVELS logLevel = LogTypes::LINFO;
@ -184,12 +188,15 @@ void NativeInit(int argc, const char *argv[], const char *savegame_directory, co
break;
case 'j':
g_Config.iCpuCore = CPU_JIT;
g_Config.bSaveSettings = false;
break;
case 'f':
g_Config.iCpuCore = CPU_FASTINTERPRETER;
g_Config.bSaveSettings = false;
break;
case 'i':
g_Config.iCpuCore = CPU_INTERPRETER;
g_Config.bSaveSettings = false;
break;
}
} else {
@ -207,10 +214,6 @@ void NativeInit(int argc, const char *argv[], const char *savegame_directory, co
}
}
config_filename = user_data_path + "ppsspp.ini";
g_Config.Load(config_filename.c_str());
if (g_Config.currentDirectory == "") {
#if defined(ANDROID) || defined(BLACKBERRY) || defined(__SYMBIAN32__)
g_Config.currentDirectory = external_directory;