diff options
| author | sl1nk3.s <sl1nk3.s@gmail.com> | 2009-10-22 19:13:22 +0000 |
|---|---|---|
| committer | sl1nk3.s <sl1nk3.s@gmail.com> | 2009-10-22 19:13:22 +0000 |
| commit | 833341696b53383c0f45651b5f5f85655a3eb3a9 (patch) | |
| tree | 36f97440fb4c057ed54ff2d21996bf89defb970d /Source/Core/VideoCommon/Src/VideoConfig.cpp | |
| parent | 5fb95d04436d40e65f216c1ff51333d4832ee82a (diff) | |
Fix issue 1549, issue 1400, a crash when pressing reset while no game were running and better fix for issue 1556
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4451 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/VideoCommon/Src/VideoConfig.cpp')
| -rw-r--r-- | Source/Core/VideoCommon/Src/VideoConfig.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/Core/VideoCommon/Src/VideoConfig.cpp b/Source/Core/VideoCommon/Src/VideoConfig.cpp index 34aaa11527..d99116560c 100644 --- a/Source/Core/VideoCommon/Src/VideoConfig.cpp +++ b/Source/Core/VideoCommon/Src/VideoConfig.cpp @@ -89,7 +89,7 @@ void VideoConfig::Load(const char *ini_file) iniFile.Get("Hacks", "EFBAccessEnable", &bEFBAccessEnable, true); iniFile.Get("Hacks", "EFBCopyDisable", &bEFBCopyDisable, 0); - iniFile.Get("Hacks", "EFBCopyDisableHotKey", &bEFBCopyDisableHotKey, 0); + iniFile.Get("Hacks", "EFBCopyDisableHotKey", &bOSDHotKey, 0); iniFile.Get("Hacks", "EFBToTextureEnable", &bCopyEFBToRAM, 0); iniFile.Get("Hacks", "ProjectionHack", &iPhackvalue, 0); @@ -117,7 +117,7 @@ void VideoConfig::GameIniLoad(const char *ini_file) if (iniFile.Exists("Video", "EFBCopyDisable")) iniFile.Get("Video", "EFBCopyDisable", &bEFBCopyDisable, 0); if (iniFile.Exists("Video", "EFBCopyDisableHotKey")) - iniFile.Get("Video", "EFBCopyDisableHotKey", &bEFBCopyDisableHotKey, 0); + iniFile.Get("Video", "EFBCopyDisableHotKey", &bOSDHotKey, 0); if (iniFile.Exists("Video", "EFBToRAMEnable")) iniFile.Get("Video", "EFBToRAMEnable", &bCopyEFBToRAM, 0); if (iniFile.Exists("Video", "SafeTextureCache")) @@ -179,7 +179,7 @@ void VideoConfig::Save(const char *ini_file) iniFile.Set("Hacks", "EFBAccessEnable", bEFBAccessEnable); iniFile.Set("Hacks", "EFBCopyDisable", bEFBCopyDisable); - iniFile.Set("Hacks", "EFBCopyDisableHotKey", bEFBCopyDisableHotKey); + iniFile.Set("Hacks", "EFBCopyDisableHotKey", bOSDHotKey); iniFile.Set("Hacks", "EFBToTextureEnable", bCopyEFBToRAM); iniFile.Set("Hacks", "ProjectionHack", iPhackvalue); |