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

Build fix. :3 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7372 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Jordan Woyak 2011-03-18 23:10:56 +00:00
parent 7360bd0d88
commit 3eb2196d27
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Source/Core/Core/Src/State.cpp
View File

@ -392,8 +392,17 @@ void Shutdown()
{ {
Flush(); Flush();
g_current_buffer.clear(); // swapping with an empty vector, rather than clear()ing
g_undo_load_buffer.clear(); // this gives a better guarantee to free the allocated memory right NOW
{
std::vector<u8> tmp;
g_current_buffer.swap(tmp);
}
{
std::vector<u8> tmp;
g_undo_load_buffer.swap(tmp);
}
} }
static std::string MakeStateFilename(int number) static std::string MakeStateFilename(int number)

4
Source/Core/DolphinWX/Src/InputConfigDiag.cpp
View File

@ -37,7 +37,9 @@ void GamepadPage::ConfigExtension(wxCommandEvent& event)
// show config diag, if "none" isn't selected // show config diag, if "none" isn't selected
if (ex->switch_extension) if (ex->switch_extension)
{ {
wxDialog dlg(this, -1, WXTSTR_FROM_CSTR(ex->attachments[ex->switch_extension]->GetName().c_str())); wxDialog dlg(this, -1,
WXTSTR_FROM_CSTR(ex->attachments[ex->switch_extension]->GetName().c_str()),
wxDefaultPosition, wxDefaultSize);
wxBoxSizer* const main_szr = new wxBoxSizer(wxVERTICAL); wxBoxSizer* const main_szr = new wxBoxSizer(wxVERTICAL);
const std::size_t orig_size = control_groups.size(); const std::size_t orig_size = control_groups.size();