From b6c49a52966b911123ee12dea18dc6b91a2c730c Mon Sep 17 00:00:00 2001 From: Fred Gleason Date: Wed, 21 Jun 2023 15:43:55 -0400 Subject: [PATCH] 2023-06-21 Fred Gleason * Fixed a regression in rdcatch(1) that caused a phantom event entry to appear in the Event List while processing the 'Start Record Deck' ['RS'] RML. Signed-off-by: Fred Gleason --- ChangeLog | 4 ++++ rdcatch/recordlistmodel.cpp | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 4d8fa1cd6..36fe938ff 100644 --- a/ChangeLog +++ b/ChangeLog @@ -24248,3 +24248,7 @@ 2023-06-21 Fred Gleason * Fixed a bug in rdcatchd(8) that would cause a segfault after reception of a 'Start Record Deck' ['RS'] RML. +2023-06-21 Fred Gleason + * Fixed a regression in rdcatch(1) that caused a phantom event + entry to appear in the Event List while processing the + 'Start Record Deck' ['RS'] RML. diff --git a/rdcatch/recordlistmodel.cpp b/rdcatch/recordlistmodel.cpp index b715b3792..51880d721 100644 --- a/rdcatch/recordlistmodel.cpp +++ b/rdcatch/recordlistmodel.cpp @@ -319,7 +319,6 @@ void RecordListModel::setRecordStatus(const QModelIndex &row, void RecordListModel::setRecordStatus(unsigned rec_id,RDDeck::Status status) { int index=d_ids.indexOf(rec_id); - if(index>=0) { if(d_statuses.at(index)!=status) { d_statuses[index]=status; @@ -364,6 +363,10 @@ void RecordListModel::channelCounts(int chan,int *waiting,int *active, QModelIndex RecordListModel::addRecord(unsigned id) { + if(id>=RDCATCHD_DYNAMIC_BASE_ID) { + return QModelIndex(); // Don't process dynamic record events! + } + // // Find the insertion offset //