Archive/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-05-02 14:58:03 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #9565 from sepalani/qt-blocker

Browse source 
BreakpointWidget: Use QSignalBlocker
This commit is contained in:
Léo Lam 2021-03-05 10:44:44 +01:00 • committed by GitHub
commit adcdeda372
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

28
Source/Core/DolphinQt/Debugger/BreakpointWidget.cpp
View file

@ -6,6 +6,7 @@
#include <QHeaderView> #include <QHeaderView>
#include <QMenu> #include <QMenu>
#include <QSignalBlocker>
#include <QTableWidget> #include <QTableWidget>
#include <QToolBar> #include <QToolBar>
#include <QVBoxLayout> #include <QVBoxLayout>
@ -262,9 +263,8 @@ void BreakpointWidget::OnDelete()
if (is_memcheck) if (is_memcheck)
{ {
Settings::Instance().blockSignals(true); const QSignalBlocker blocker(Settings::Instance());
PowerPC::memchecks.Remove(address); PowerPC::memchecks.Remove(address);
Settings::Instance().blockSignals(false);
} }
else else
{ {
@ -278,9 +278,10 @@ void BreakpointWidget::OnDelete()
void BreakpointWidget::OnClear() void BreakpointWidget::OnClear()
{ {
PowerPC::debug_interface.ClearAllBreakpoints(); PowerPC::debug_interface.ClearAllBreakpoints();
Settings::Instance().blockSignals(true); {
PowerPC::debug_interface.ClearAllMemChecks(); const QSignalBlocker blocker(Settings::Instance());
Settings::Instance().blockSignals(false); PowerPC::debug_interface.ClearAllMemChecks();
}
m_table->setRowCount(0); m_table->setRowCount(0);
@ -314,9 +315,8 @@ void BreakpointWidget::OnLoad()
if (ini.GetLines("MemoryBreakPoints", &new_mcs, false)) if (ini.GetLines("MemoryBreakPoints", &new_mcs, false))
{ {
PowerPC::memchecks.Clear(); PowerPC::memchecks.Clear();
Settings::Instance().blockSignals(true); const QSignalBlocker blocker(Settings::Instance());
PowerPC::memchecks.AddFromStrings(new_mcs); PowerPC::memchecks.AddFromStrings(new_mcs);
Settings::Instance().blockSignals(false);
} }
emit BreakpointsChanged(); emit BreakpointsChanged();
@ -410,9 +410,10 @@ void BreakpointWidget::AddAddressMBP(u32 addr, bool on_read, bool on_write, bool
check.log_on_hit = do_log; check.log_on_hit = do_log;
check.break_on_hit = do_break; check.break_on_hit = do_break;
Settings::Instance().blockSignals(true); {
PowerPC::memchecks.Add(check); const QSignalBlocker blocker(Settings::Instance());
Settings::Instance().blockSignals(false); PowerPC::memchecks.Add(check);
}
emit BreakpointsChanged(); emit BreakpointsChanged();
Update(); Update();
@ -431,9 +432,10 @@ void BreakpointWidget::AddRangedMBP(u32 from, u32 to, bool on_read, bool on_writ
check.log_on_hit = do_log; check.log_on_hit = do_log;
check.break_on_hit = do_break; check.break_on_hit = do_break;
Settings::Instance().blockSignals(true); {
PowerPC::memchecks.Add(check); const QSignalBlocker blocker(Settings::Instance());
Settings::Instance().blockSignals(false); PowerPC::memchecks.Add(check);
}
emit BreakpointsChanged(); emit BreakpointsChanged();
Update(); Update();