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-29 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Fixed a regression in rdairplay(1) that caused a segfault when
	selecting a cart in the 'Select Cart' dialog if the Cue output
	assignment was disabled.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason
2022-09-29 14:06:19 -04:00
parent 5f45045849
commit af4fec015f
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -23415,3 +23415,7 @@
2022-09-29 Fred Gleason <fredg@paravelsystems.com> 2022-09-29 Fred Gleason <fredg@paravelsystems.com>
* Modified rddbmgr(8) to include the Realm name in its default * Modified rddbmgr(8) to include the Realm name in its default
output. output.
2022-09-29 Fred Gleason <fredg@paravelsystems.com>
* Fixed a regression in rdairplay(1) that caused a segfault when
selecting a cart in the 'Select Cart' dialog if the Cue output
assignment was disabled.

4
lib/rdcart_dialog.cpp
View File

@@ -112,8 +112,6 @@ RDCartDialog::RDCartDialog(QString *filter,QString *group,QString *schedcode,
cart_player= cart_player=
new RDSimplePlayer(rda->cae(),rda->ripc(),rda->station()->cueCard(),rda->station()->cuePort(), new RDSimplePlayer(rda->cae(),rda->ripc(),rda->station()->cueCard(),rda->station()->cuePort(),
rda->station()->cueStartCart(),rda->station()->cueStopCart(),this); rda->station()->cueStartCart(),rda->station()->cueStopCart(),this);
// cart_player->playButton()->setDisabled(true);
// cart_player->stopButton()->setDisabled(true);
cart_player->stopButton()->setOnColor(Qt::red); cart_player->stopButton()->setOnColor(Qt::red);
} }
@@ -241,7 +239,7 @@ void RDCartDialog::selectionChangedData(const QItemSelection &before,
{ {
QModelIndexList rows=cart_cart_view->selectionModel()->selectedRows(); QModelIndexList rows=cart_cart_view->selectionModel()->selectedRows();
if(rows.size()==1) { if((cart_player!=NULL)&&(rows.size()==1)) {
cart_player->setCart(cart_cart_model->cartNumber(rows.at(0))); cart_player->setCart(cart_cart_model->cartNumber(rows.at(0)));
cart_player->playButton()-> cart_player->playButton()->
setEnabled(cart_cart_model->cartType(rows.at(0))==RDCart::Audio); setEnabled(cart_cart_model->cartType(rows.at(0))==RDCart::Audio);