Skip to content

Commit 18e008c

Browse files
committed
Signal currentRecipientChanged before deleting in SendRecipientsListModel::remove
1 parent cc50078 commit 18e008c

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

qml/models/sendrecipientslistmodel.cpp

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -93,15 +93,17 @@ void SendRecipientsListModel::remove()
9393
return;
9494
}
9595
beginRemoveRows(QModelIndex(), m_current, m_current);
96-
delete m_recipients.takeAt(m_current);
97-
endRemoveRows();
98-
Q_EMIT countChanged();
99-
10096
if (m_current > 0) {
97+
int index_to_remove = m_current;
10198
setCurrentIndex(m_current - 1);
99+
delete m_recipients.takeAt(index_to_remove);
102100
} else {
101+
auto removed_recipient = m_recipients.takeAt(m_current);
103102
Q_EMIT currentRecipientChanged();
103+
delete removed_recipient;
104104
}
105+
endRemoveRows();
106+
Q_EMIT countChanged();
105107
}
106108

107109
SendRecipient* SendRecipientsListModel::currentRecipient() const

0 commit comments

Comments
 (0)