Merge pull request #6851 from lioncash/usage

BreakpointWidget: Move variables closer to usage sites in OnLoad()
This commit is contained in:
Léo Lam 2018-05-14 19:18:05 +02:00 committed by GitHub
commit 159f6115e2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 7 deletions

View File

@ -253,26 +253,25 @@ void BreakpointWidget::OnNewBreakpoint()
void BreakpointWidget::OnLoad() void BreakpointWidget::OnLoad()
{ {
IniFile ini; IniFile ini;
BreakPoints::TBreakPointsStr newbps;
MemChecks::TMemChecksStr newmcs;
if (!ini.Load(File::GetUserPath(D_GAMESETTINGS_IDX) + SConfig::GetInstance().GetGameID() + ".ini", if (!ini.Load(File::GetUserPath(D_GAMESETTINGS_IDX) + SConfig::GetInstance().GetGameID() + ".ini",
false)) false))
{ {
return; return;
} }
if (ini.GetLines("BreakPoints", &newbps, false)) BreakPoints::TBreakPointsStr new_bps;
if (ini.GetLines("BreakPoints", &new_bps, false))
{ {
PowerPC::breakpoints.Clear(); 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(); PowerPC::memchecks.Clear();
Settings::Instance().blockSignals(true); Settings::Instance().blockSignals(true);
PowerPC::memchecks.AddFromStrings(newmcs); PowerPC::memchecks.AddFromStrings(new_mcs);
Settings::Instance().blockSignals(false); Settings::Instance().blockSignals(false);
} }