diff options
| author | skidau <skidau@gmail.com> | 2014-10-26 23:23:45 +1100 |
|---|---|---|
| committer | skidau <skidau@gmail.com> | 2014-10-26 23:23:45 +1100 |
| commit | 4570dd7eeb9033c0e349d3a9f0126f24010b0699 (patch) | |
| tree | 6e8704557eb9843e54ccc33675d4949900d3376c /Source/Core/DolphinWX/FrameTools.cpp | |
| parent | 7eebbcdca7f5dff60aff387f789bc1292905c68a (diff) | |
Fixed a crash that would occur if a new watch were added by entering a watch name.
Code style updates.
Diffstat (limited to 'Source/Core/DolphinWX/FrameTools.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/FrameTools.cpp | 42 |
1 files changed, 18 insertions, 24 deletions
diff --git a/Source/Core/DolphinWX/FrameTools.cpp b/Source/Core/DolphinWX/FrameTools.cpp index c4a8009017..0c27b52308 100644 --- a/Source/Core/DolphinWX/FrameTools.cpp +++ b/Source/Core/DolphinWX/FrameTools.cpp @@ -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) + { + g_pCodeWindow->m_WatchWindow->SaveAll(); + PowerPC::watches.Clear(); + } + if (g_pCodeWindow->m_BreakpointWindow) { - 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_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 |