Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-10-16 15:41:13 +02:00
Code Issues Projects Releases Wiki Activity

2022-09-19 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Fixed a regression in rdcatch(1) that caused a segfault when
	attempting to add or delete an event.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason
2022-09-19 10:21:36 -04:00
parent aae5245ca4
commit a1ecaa871d
3 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@@ -23336,3 +23336,6 @@
2022-09-18 Fred Gleason <fredg@paravelsystems.com> 2022-09-18 Fred Gleason <fredg@paravelsystems.com>
* Removed debugging printf() statements from * Removed debugging printf() statements from
'rdcatch/recordlistmodel.cpp'. 'rdcatch/recordlistmodel.cpp'.
2022-09-19 Fred Gleason <fredg@paravelsystems.com>
* Fixed a regression in rdcatch(1) that caused a segfault when
attempting to add or delete an event.

14
rdcatch/recordlistmodel.cpp
View File

@@ -250,13 +250,13 @@ RDRecording::ExitCode RecordListModel::recordExitCode(const QModelIndex &row)
QString RecordListModel::hostName(const QModelIndex &row) const QString RecordListModel::hostName(const QModelIndex &row) const
{ {
return d_texts.at(row.row()).at(23).toString(); return d_hostnames.at(row.row());
} }
QString RecordListModel::cutName(const QModelIndex &row) const QString RecordListModel::cutName(const QModelIndex &row) const
{ {
return d_texts.at(row.row()).at(25).toString(); return d_cutnames.at(row.row());
} }
@@ -379,7 +379,9 @@ QModelIndex RecordListModel::addRecord(unsigned id)
list.push_back(QVariant()); list.push_back(QVariant());
} }
d_ids.insert(offset,id); d_ids.insert(offset,id);
d_hostnames.insert(offset,QString());
d_channels.insert(offset,-1); d_channels.insert(offset,-1);
d_cutnames.insert(offset,QString());
d_types.insert(offset,RDRecording::Recording); d_types.insert(offset,RDRecording::Recording);
d_exit_codes.insert(offset,RDRecording::Ok); d_exit_codes.insert(offset,RDRecording::Ok);
d_text_colors.insert(offset,QVariant()); d_text_colors.insert(offset,QVariant());
@@ -400,7 +402,9 @@ void RecordListModel::removeRecord(const QModelIndex &row)
beginRemoveRows(QModelIndex(),row.row(),row.row()); beginRemoveRows(QModelIndex(),row.row(),row.row());
d_ids.removeAt(row.row()); d_ids.removeAt(row.row());
d_hostnames.removeAt(row.row());
d_channels.removeAt(row.row()); d_channels.removeAt(row.row());
d_cutnames.removeAt(row.row());
d_types.removeAt(row.row()); d_types.removeAt(row.row());
d_exit_codes.removeAt(row.row()); d_exit_codes.removeAt(row.row());
d_is_nexts.removeAt(row.row()); d_is_nexts.removeAt(row.row());
@@ -533,7 +537,9 @@ void RecordListModel::updateModel(const QString &filter_sql)
sql=sqlFields()+filter_sql; sql=sqlFields()+filter_sql;
beginResetModel(); beginResetModel();
d_ids.clear(); d_ids.clear();
d_hostnames.clear();
d_channels.clear(); d_channels.clear();
d_cutnames.clear();
d_types.clear(); d_types.clear();
d_exit_codes.clear(); d_exit_codes.clear();
d_is_nexts.clear(); d_is_nexts.clear();
@@ -545,7 +551,9 @@ void RecordListModel::updateModel(const QString &filter_sql)
q=new RDSqlQuery(sql); q=new RDSqlQuery(sql);
while(q->next()) { while(q->next()) {
d_ids.push_back(0); d_ids.push_back(0);
d_hostnames.push_back(QString());
d_channels.push_back(-1); d_channels.push_back(-1);
d_cutnames.push_back(QString());
d_types.push_back(RDRecording::Recording); d_types.push_back(RDRecording::Recording);
d_exit_codes.push_back(RDRecording::Ok); d_exit_codes.push_back(RDRecording::Ok);
d_text_colors.push_back(QVariant()); d_text_colors.push_back(QVariant());
@@ -587,7 +595,9 @@ void RecordListModel::updateRow(int row,RDSqlQuery *q)
// Event Values // Event Values
// //
d_ids[row]=q->value(0).toUInt(); d_ids[row]=q->value(0).toUInt();
d_hostnames[row]=q->value(3).toString();
d_channels[row]=q->value(29).toUInt(); d_channels[row]=q->value(29).toUInt();
d_cutnames[row]=q->value(6).toString();
d_types[row]=(RDRecording::Type)q->value(23).toUInt(); d_types[row]=(RDRecording::Type)q->value(23).toUInt();
d_exit_codes[row]=(RDRecording::ExitCode)q->value(25).toUInt(); d_exit_codes[row]=(RDRecording::ExitCode)q->value(25).toUInt();

2
rdcatch/recordlistmodel.h
View File

@@ -97,7 +97,9 @@ class RecordListModel : public QAbstractTableModel
QList<QVariant> d_alignments; QList<QVariant> d_alignments;
QList<QList<QVariant> > d_texts; QList<QList<QVariant> > d_texts;
QList<unsigned> d_ids; QList<unsigned> d_ids;
QStringList d_hostnames;
QList<int> d_channels; QList<int> d_channels;
QStringList d_cutnames;
QList<RDRecording::Type> d_types; QList<RDRecording::Type> d_types;
QList<RDRecording::ExitCode> d_exit_codes; QList<RDRecording::ExitCode> d_exit_codes;
QList<QVariant> d_text_colors; QList<QVariant> d_text_colors;