mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-07-23 06:09:50 -06:00
Fixed one of the two remaining crash on Stop (issue 600), and removed some setup defines which are now useless anyway.
There's an attempt to implement Peek_Color too, probably done wrong :P git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3799 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
@ -173,9 +173,9 @@ void CFrame::CreateMenu()
|
||||
toolsMenu->Append(IDM_CHEATS, _T("Action &Replay Manager"));
|
||||
toolsMenu->Append(IDM_INFO, _T("System Information"));
|
||||
|
||||
#if defined(HAVE_SFML) && HAVE_SFML
|
||||
toolsMenu->Append(IDM_NETPLAY, _T("Start &NetPlay"));
|
||||
|
||||
// toolsMenu->Append(IDM_SDCARD, _T("Mount &SDCard")); // Disable for now
|
||||
#endif
|
||||
|
||||
if (DiscIO::CNANDContentManager::Access().GetNANDLoader(FULL_WII_MENU_DIR).IsValid())
|
||||
{
|
||||
@ -524,15 +524,6 @@ void CFrame::DoStop()
|
||||
return;
|
||||
|
||||
Core::Stop();
|
||||
|
||||
#ifdef SETUP_TIMER_WAITING
|
||||
// Idle-wait for core to completely shut down (without this wait the
|
||||
// GameCtrlPanel is restored to a state where we can open another game
|
||||
// and effectively crash Dolphin)
|
||||
while(Core::isRunning())
|
||||
SLEEP(10);
|
||||
#endif
|
||||
|
||||
UpdateGUI();
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user