preserve-emulation/ppsspp
1
0 Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-10-11 13:36:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:hrydgard/ppsspp

Browse Source 
Conflicts:
	Core/Config.h
This commit is contained in:
Henrik Rydgård committed 2012-12-05 10:57:30 +07:00
2 parents 700921deb3 e6ab4b9fb1
commit 36943db4ec
27 files changed
+700 -375
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Core/Config.cpp
+2 -2
View File
@@ -48,7 +48,7 @@ void CConfig::Load(const char *iniFileName)
general->Get("ConfirmOnQuit", &bConfirmOnQuit, false);
general->Get("IgnoreBadMemAccess", &bIgnoreBadMemAccess, true);
general->Get("CurrentDirectory", &currentDirectory, "");
general->Get("ShowDebuggerOnLoad", &bShowDebuggerOnLoad, false);
IniFile::Section *cpu = iniFile.GetOrCreateSection("CPU");
cpu->Get("Core", &iCpuCore, 0);
@@ -80,7 +80,7 @@ void CConfig::Save()
general->Set("ConfirmOnQuit", bConfirmOnQuit);
general->Set("IgnoreBadMemAccess", bIgnoreBadMemAccess);
general->Set("CurrentDirectory", currentDirectory);
general->Set("ShowDebuggerOnLoad", bShowDebuggerOnLoad);
IniFile::Section *cpu = iniFile.GetOrCreateSection("CPU");
cpu->Set("Core", iCpuCore);