diff options
| author | Matthew Parlane <parlane@gmail.com> | 2014-03-17 17:43:20 +1300 |
|---|---|---|
| committer | Matthew Parlane <parlane@gmail.com> | 2014-03-17 17:43:20 +1300 |
| commit | 6445e02d53a9951c845c2fed23d825109f9b6d79 (patch) | |
| tree | de14a92b7e7f144c328739eb5339ef9436d49dd0 /Source/Core/DolphinWX/Debugger/BreakpointWindow.cpp | |
| parent | d3e9702cecc5b7f9078ef3448f7d513226ebeedd (diff) | |
| parent | 46becfc06b3a8b91d0500a8ee226c85b4450dddf (diff) | |
Merge pull request #159 from Tilka/misc
Cleanup stuff
Diffstat (limited to 'Source/Core/DolphinWX/Debugger/BreakpointWindow.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/Debugger/BreakpointWindow.cpp | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/Source/Core/DolphinWX/Debugger/BreakpointWindow.cpp b/Source/Core/DolphinWX/Debugger/BreakpointWindow.cpp index b650ac2655..1fa0183cdb 100644 --- a/Source/Core/DolphinWX/Debugger/BreakpointWindow.cpp +++ b/Source/Core/DolphinWX/Debugger/BreakpointWindow.cpp @@ -112,7 +112,7 @@ CBreakPointWindow::CBreakPointWindow(CCodeWindow* _pCodeWindow, wxWindow* parent m_BreakPointListView = new CBreakPointView(this, wxID_ANY); m_mgr.AddPane(new CBreakPointBar(this, wxID_ANY), wxAuiPaneInfo().ToolbarPane().Top(). - LeftDockable(false).RightDockable(false).BottomDockable(false).Floatable(false)); + LeftDockable(false).RightDockable(false).BottomDockable(false).Floatable(false)); m_mgr.AddPane(m_BreakPointListView, wxAuiPaneInfo().CenterPane()); m_mgr.Update(); } @@ -195,12 +195,19 @@ void CBreakPointWindow::LoadAll(wxCommandEvent& WXUNUSED(event)) MemChecks::TMemChecksStr newmcs; if (!ini.Load(File::GetUserPath(F_DEBUGGERCONFIG_IDX))) + { return; + } - if (ini.GetLines("BreakPoints", newbps, false)) + if (ini.GetLines("BreakPoints", &newbps, false)) + { PowerPC::breakpoints.AddFromStrings(newbps); - if (ini.GetLines("MemoryChecks", newmcs, false)) + } + + if (ini.GetLines("MemoryChecks", &newmcs, false)) + { PowerPC::memchecks.AddFromStrings(newmcs); + } NotifyUpdate(); } |
