From a0a0295f9d54f96eaf97ff4adf0e9bf854612584 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sun, 13 May 2018 17:52:26 -0400 Subject: [PATCH] BreakpointWidget: Move variables closer to usage sites in OnLoad() In the early-out case, we now don't end up constructing two vectors that aren't even used. It also keeps relevant code together. --- .../Core/DolphinQt2/Debugger/BreakpointWidget.cpp | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/Source/Core/DolphinQt2/Debugger/BreakpointWidget.cpp b/Source/Core/DolphinQt2/Debugger/BreakpointWidget.cpp index 7f0e81bfc0..77420adacf 100644 --- a/Source/Core/DolphinQt2/Debugger/BreakpointWidget.cpp +++ b/Source/Core/DolphinQt2/Debugger/BreakpointWidget.cpp @@ -253,26 +253,25 @@ void BreakpointWidget::OnNewBreakpoint() void BreakpointWidget::OnLoad() { IniFile ini; - BreakPoints::TBreakPointsStr newbps; - MemChecks::TMemChecksStr newmcs; - if (!ini.Load(File::GetUserPath(D_GAMESETTINGS_IDX) + SConfig::GetInstance().GetGameID() + ".ini", false)) { return; } - if (ini.GetLines("BreakPoints", &newbps, false)) + BreakPoints::TBreakPointsStr new_bps; + if (ini.GetLines("BreakPoints", &new_bps, false)) { PowerPC::breakpoints.Clear(); - PowerPC::breakpoints.AddFromStrings(newbps); + PowerPC::breakpoints.AddFromStrings(new_bps); } - if (ini.GetLines("MemoryBreakPoints", &newmcs, false)) + MemChecks::TMemChecksStr new_mcs; + if (ini.GetLines("MemoryBreakPoints", &new_mcs, false)) { PowerPC::memchecks.Clear(); Settings::Instance().blockSignals(true); - PowerPC::memchecks.AddFromStrings(newmcs); + PowerPC::memchecks.AddFromStrings(new_mcs); Settings::Instance().blockSignals(false); }