mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-08-07 16:49:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed a crash that would occur if a new watch were added by entering a watch name.

Browse source 
Code style updates.
This commit is contained in:
skidau 2014-10-26 23:23:45 +11:00
commit 4570dd7eeb
9 changed files with 53 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

42
Source/Core/DolphinWX/FrameTools.cpp
View file

@ -661,15 +661,12 @@ void CFrame::BootGame(const std::string& filename)
if (!bootfile.empty())
{
StartGame(bootfile);
if (UseDebugger)
if (UseDebugger && g_pCodeWindow)
{
if (g_pCodeWindow)
{
if (g_pCodeWindow->m_WatchWindow)
g_pCodeWindow->m_WatchWindow->LoadAll();
if (g_pCodeWindow->m_BreakpointWindow)
g_pCodeWindow->m_BreakpointWindow->LoadAll();
}
if (g_pCodeWindow->m_WatchWindow)
g_pCodeWindow->m_WatchWindow->LoadAll();
if (g_pCodeWindow->m_BreakpointWindow)
g_pCodeWindow->m_BreakpointWindow->LoadAll();
}
}
}
@ -1178,25 +1175,22 @@ void CFrame::DoStop()
}
}
if (UseDebugger)
if (UseDebugger && g_pCodeWindow)
{
if (g_pCodeWindow)
if (g_pCodeWindow->m_WatchWindow)
{
if (g_pCodeWindow->m_WatchWindow)
{
g_pCodeWindow->m_WatchWindow->SaveAll();
PowerPC::watches.Clear();
}
if (g_pCodeWindow->m_BreakpointWindow)
{
g_pCodeWindow->m_BreakpointWindow->SaveAll();
PowerPC::breakpoints.Clear();
PowerPC::memchecks.Clear();
g_pCodeWindow->m_BreakpointWindow->NotifyUpdate();
}
g_symbolDB.Clear();
Host_NotifyMapLoaded();
g_pCodeWindow->m_WatchWindow->SaveAll();
PowerPC::watches.Clear();
}
if (g_pCodeWindow->m_BreakpointWindow)
{
g_pCodeWindow->m_BreakpointWindow->SaveAll();
PowerPC::breakpoints.Clear();
PowerPC::memchecks.Clear();
g_pCodeWindow->m_BreakpointWindow->NotifyUpdate();
}
g_symbolDB.Clear();
Host_NotifyMapLoaded();
}
// TODO: Show the author/description dialog here