ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Debugger: Fix crash during breakpoint deletion

This commit is contained in:
chaoticgd 2025-03-19 01:48:52 +00:00 committed by Ty
parent c8b1e4c4e6
commit 5393d724c5
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pcsx2-qt/Debugger/Breakpoints/BreakpointModel.cpp
View File

@ -59,7 +59,7 @@ int BreakpointModel::columnCount(const QModelIndex&) const
QVariant BreakpointModel::data(const QModelIndex& index, int role) const
{
size_t row = static_cast<size_t>(index.row());
const size_t row = static_cast<size_t>(index.row());
if (!index.isValid() || row >= m_breakpoints.size())
return QVariant();
@ -298,7 +298,7 @@ Qt::ItemFlags BreakpointModel::flags(const QModelIndex& index) const
bool BreakpointModel::setData(const QModelIndex& index, const QVariant& value, int role)
{
size_t row = static_cast<size_t>(index.row());
const size_t row = static_cast<size_t>(index.row());
if (!index.isValid() || row >= m_breakpoints.size())
return false;
@ -401,9 +401,14 @@ bool BreakpointModel::setData(const QModelIndex& index, const QVariant& value, i
bool BreakpointModel::removeRows(int row, int count, const QModelIndex& index)
{
const size_t begin_index = static_cast<size_t>(row);
const size_t end_index = static_cast<size_t>(row + count);
if (end_index > m_breakpoints.size())
return false;
beginRemoveRows(index, row, row + count - 1);
for (int i = row; i < row + count; i++)
for (size_t i = begin_index; i < end_index; i++)
{
auto bp_mc = m_breakpoints.at(i);
@ -420,6 +425,7 @@ bool BreakpointModel::removeRows(int row, int count, const QModelIndex& index)
});
}
}
const auto begin = m_breakpoints.begin() + row;
const auto end = begin + count;
m_breakpoints.erase(begin, end);

14
pcsx2-qt/Debugger/Breakpoints/BreakpointWidget.cpp
View File

@ -111,16 +111,14 @@ void BreakpointWidget::contextDelete()
if (!selModel->hasSelection())
return;
QModelIndexList rows = selModel->selectedIndexes();
QModelIndexList indices = selModel->selectedIndexes();
std::sort(rows.begin(), rows.end(), [](const QModelIndex& a, const QModelIndex& b) {
return a.row() > b.row();
});
std::set<int> rows;
for (QModelIndex index : indices)
rows.emplace(index.row());
for (const QModelIndex& index : rows)
{
m_model->removeRows(index.row(), 1);
}
for (auto row = rows.rbegin(); row != rows.rend(); row++)
m_model->removeRows(*row, 1);
}
void BreakpointWidget::contextNew()