preserve-emulation/ppsspp
1
0 Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-11-14 18:19:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

NativeApp: Load config before processing flags (duh)

Browse Source
This commit is contained in:
Henrik Rydgård committed 2012-12-25 09:02:02 +01:00
1 parent 875f3569ee
commit d56bc40db4
2 files changed
+19 -9
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

android/jni/NativeApp.cpp
+7 -4
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;