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

wx: keep execute and SPU_Pause together 

execute=false and SPU_Pause(1) belongs together (avoid sound problems).

From: Jan Bücken (nooris), #3301520
This commit is contained in:
riccardom 2011-06-03 16:40:09 +00:00
parent 3503f1cc56
commit b7a9d5085f
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
desmume/src/wx/wxMain.cpp
View File

@ -165,6 +165,7 @@ void DesmumeFrame::NDSInitialize() {
void DesmumeFrame::OnQuit(wxCommandEvent& WXUNUSED(event)) void DesmumeFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
{ {
execute = false; execute = false;
SPU_Pause(1);
NDS_DeInit(); NDS_DeInit();
Close(true); Close(true);
} }
@ -249,8 +250,9 @@ void DesmumeFrame::LoadRom(wxCommandEvent& event)
wxFileDialog dialog(this,_T("Load Rom"),wxGetHomeDir(),_T(""),_T("*.nds"),wxFD_OPEN, wxDefaultPosition, wxDefaultSize); wxFileDialog dialog(this,_T("Load Rom"),wxGetHomeDir(),_T(""),_T("*.nds"),wxFD_OPEN, wxDefaultPosition, wxDefaultSize);
if(dialog.ShowModal() == wxID_OK) { if(dialog.ShowModal() == wxID_OK) {
history->AddFileToHistory(dialog.GetPath()); history->AddFileToHistory(dialog.GetPath());
execute = true;
NDS_LoadROM(dialog.GetPath().mb_str(), dialog.GetPath().mb_str()); NDS_LoadROM(dialog.GetPath().mb_str(), dialog.GetPath().mb_str());
execute = true;
SPU_Pause(0);
} }
} }
@ -649,9 +651,10 @@ void DesmumeFrame::OnOpenRecent(wxCommandEvent &event) {
size_t id = event.GetId()-wxID_FILE1; size_t id = event.GetId()-wxID_FILE1;
ret = NDS_LoadROM(history->GetHistoryFile(id).mb_str(), history->GetHistoryFile(id).mb_str()); ret = NDS_LoadROM(history->GetHistoryFile(id).mb_str(), history->GetHistoryFile(id).mb_str());
if (ret > 0) if (ret > 0) {
execute = true; execute = true;
else SPU_Pause(0);
} else
history->RemoveFileFromHistory(id); history->RemoveFileFromHistory(id);
} }