ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #352 from shuffle2/master 

[windows] Fix debug build memory leaks.
This commit is contained in:
shuffle2 2014-05-10 20:18:03 -07:00
parent b4e1ac5f08 fa65eeb492
commit adbb4c4a0c
2 changed files with 0 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Source/Core/Core/State.cpp
View File

@ -427,16 +427,6 @@ void LoadAs(const std::string& filename)
// Stop the core while we load the state // Stop the core while we load the state
bool wasUnpaused = Core::PauseAndLock(true); bool wasUnpaused = Core::PauseAndLock(true);
#if defined _DEBUG && defined _WIN32
// we use _CRTDBG_DELAY_FREE_MEM_DF (as a speed hack?),
// but it was causing us to leak gigantic amounts of memory here,
// enough that only a few savestates could be loaded before crashing,
// so let's disable it temporarily.
int tmpflag = _CrtSetDbgFlag(_CRTDBG_REPORT_FLAG);
if (g_loadDepth == 0)
_CrtSetDbgFlag(tmpflag & ~_CRTDBG_DELAY_FREE_MEM_DF);
#endif
g_loadDepth++; g_loadDepth++;
// Save temp buffer for undo load state // Save temp buffer for undo load state
@ -494,12 +484,6 @@ void LoadAs(const std::string& filename)
g_loadDepth--; g_loadDepth--;
#if defined _DEBUG && defined _WIN32
// restore _CRTDBG_DELAY_FREE_MEM_DF
if (g_loadDepth == 0)
_CrtSetDbgFlag(tmpflag);
#endif
// resume dat core // resume dat core
Core::PauseAndLock(false, wasUnpaused); Core::PauseAndLock(false, wasUnpaused);
} }

6
Source/Core/DolphinWX/Main.cpp
View File

@ -232,12 +232,6 @@ bool DolphinApp::OnInit()
} }
#endif // wxUSE_CMDLINE_PARSER #endif // wxUSE_CMDLINE_PARSER
#if defined _DEBUG && defined _WIN32
int tmpflag = _CrtSetDbgFlag(_CRTDBG_REPORT_FLAG);
tmpflag |= _CRTDBG_DELAY_FREE_MEM_DF;
_CrtSetDbgFlag(tmpflag);
#endif
// Register message box and translation handlers // Register message box and translation handlers
RegisterMsgAlertHandler(&wxMsgAlert); RegisterMsgAlertHandler(&wxMsgAlert);
RegisterStringTranslator(&wxStringTranslator); RegisterStringTranslator(&wxStringTranslator);