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

2017-10-25 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Fixed a bug in rdadmin(1) that caused a segfault when opening the
	'Edit Host' dialog.
This commit is contained in:
Fred Gleason 2017-10-25 08:49:06 -04:00
parent afbc6c5873
commit 939cd03a30
2 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -16198,3 +16198,6 @@
2017-10-19 Fred Gleason <fredg@paravelsystems.com> 2017-10-19 Fred Gleason <fredg@paravelsystems.com>
* Updated 'NEWS'. * Updated 'NEWS'.
* Incremented the package version to 2.17.0int02. * Incremented the package version to 2.17.0int02.
2017-10-25 Fred Gleason <fredg@paravelsystems.com>
* Fixed a bug in rdadmin(1) that caused a segfault when opening the
'Edit Host' dialog.

30
rdadmin/edit_station.cpp
View File

@ -92,7 +92,6 @@ EditStation::EditStation(QString sname,QWidget *parent)
RDTextValidator *validator=new RDTextValidator(this); RDTextValidator *validator=new RDTextValidator(this);
QIntValidator *macro_validator=new QIntValidator(1,RD_MAX_CART_NUMBER,this); QIntValidator *macro_validator=new QIntValidator(1,RD_MAX_CART_NUMBER,this);
// //
// Station Name // Station Name
// //
@ -211,7 +210,6 @@ EditStation::EditStation(QString sname,QWidget *parent)
station_stop_cart_button->setFont(small_font); station_stop_cart_button->setFont(small_font);
connect(station_stop_cart_button,SIGNAL(clicked()), connect(station_stop_cart_button,SIGNAL(clicked()),
this,SLOT(stopCartClickedData())); this,SLOT(stopCartClickedData()));
caeStationActivatedData(station_station->caeStation());
// //
// Heartbeat Checkbox // Heartbeat Checkbox
@ -321,7 +319,7 @@ EditStation::EditStation(QString sname,QWidget *parent)
station_cae_station_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); station_cae_station_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix);
// //
// RDLibrary Configuration Button // RDLibrary Configuration Button
// //
station_rdlibrary_button=new QPushButton(this); station_rdlibrary_button=new QPushButton(this);
station_rdlibrary_button->setFont(font); station_rdlibrary_button->setFont(font);
@ -329,7 +327,7 @@ EditStation::EditStation(QString sname,QWidget *parent)
connect(station_rdlibrary_button,SIGNAL(clicked()),this,SLOT(editLibraryData())); connect(station_rdlibrary_button,SIGNAL(clicked()),this,SLOT(editLibraryData()));
// //
// RDCatch Configuration Button // RDCatch Configuration Button
// //
station_rdcatch_button=new QPushButton(this); station_rdcatch_button=new QPushButton(this);
station_rdcatch_button->setFont(font); station_rdcatch_button->setFont(font);
@ -337,7 +335,7 @@ EditStation::EditStation(QString sname,QWidget *parent)
connect(station_rdcatch_button,SIGNAL(clicked()),this,SLOT(editDeckData())); connect(station_rdcatch_button,SIGNAL(clicked()),this,SLOT(editDeckData()));
// //
// RDAirPlay Configuration Button // RDAirPlay Configuration Button
// //
station_rdairplay_button=new QPushButton(this); station_rdairplay_button=new QPushButton(this);
station_rdairplay_button->setFont(font); station_rdairplay_button->setFont(font);
@ -346,7 +344,7 @@ EditStation::EditStation(QString sname,QWidget *parent)
this,SLOT(editAirPlayData())); this,SLOT(editAirPlayData()));
// //
// RDPanel Configuration Button // RDPanel Configuration Button
// //
station_rdpanel_button=new QPushButton(this); station_rdpanel_button=new QPushButton(this);
station_rdpanel_button->setFont(font); station_rdpanel_button->setFont(font);
@ -354,7 +352,7 @@ EditStation::EditStation(QString sname,QWidget *parent)
connect(station_rdpanel_button,SIGNAL(clicked()),this,SLOT(editPanelData())); connect(station_rdpanel_button,SIGNAL(clicked()),this,SLOT(editPanelData()));
// //
// RDLogEdit Configuration Button // RDLogEdit Configuration Button
// //
station_rdlogedit_button=new QPushButton(this); station_rdlogedit_button=new QPushButton(this);
station_rdlogedit_button->setFont(font); station_rdlogedit_button->setFont(font);
@ -363,7 +361,7 @@ EditStation::EditStation(QString sname,QWidget *parent)
this,SLOT(editLogEditData())); this,SLOT(editLogEditData()));
// //
// RDCartSlots Configuration Button // RDCartSlots Configuration Button
// //
station_rdcartslots_button=new QPushButton(this); station_rdcartslots_button=new QPushButton(this);
station_rdcartslots_button->setFont(font); station_rdcartslots_button->setFont(font);
@ -381,7 +379,7 @@ EditStation::EditStation(QString sname,QWidget *parent)
this,SLOT(editDropboxesData())); this,SLOT(editDropboxesData()));
// //
// Switcher Configuration Button // Switcher Configuration Button
// //
station_switchers_button=new QPushButton(this); station_switchers_button=new QPushButton(this);
station_switchers_button->setFont(font); station_switchers_button->setFont(font);
@ -390,7 +388,7 @@ EditStation::EditStation(QString sname,QWidget *parent)
this,SLOT(editSwitcherData())); this,SLOT(editSwitcherData()));
// //
// Host Variables Configuration Button // Host Variables Configuration Button
// //
station_hostvars_button=new QPushButton(this); station_hostvars_button=new QPushButton(this);
station_hostvars_button->setFont(font); station_hostvars_button->setFont(font);
@ -399,7 +397,7 @@ EditStation::EditStation(QString sname,QWidget *parent)
this,SLOT(editHostvarsData())); this,SLOT(editHostvarsData()));
// //
// Audio Ports Configuration Button // Audio Ports Configuration Button
// //
station_audioports_button=new QPushButton(this); station_audioports_button=new QPushButton(this);
station_audioports_button->setFont(font); station_audioports_button->setFont(font);
@ -408,7 +406,7 @@ EditStation::EditStation(QString sname,QWidget *parent)
this,SLOT(editAudioData())); this,SLOT(editAudioData()));
// //
// TTY Configuration Button // TTY Configuration Button
// //
station_ttys_button=new QPushButton(this); station_ttys_button=new QPushButton(this);
station_ttys_button->setFont(font); station_ttys_button->setFont(font);
@ -416,7 +414,7 @@ EditStation::EditStation(QString sname,QWidget *parent)
connect(station_ttys_button,SIGNAL(clicked()),this,SLOT(editTtyData())); connect(station_ttys_button,SIGNAL(clicked()),this,SLOT(editTtyData()));
// //
// View Adapters (Audio Resources) Configuration Button // View Adapters (Audio Resources) Configuration Button
// //
station_adapters_button=new QPushButton(this); station_adapters_button=new QPushButton(this);
station_adapters_button->setFont(font); station_adapters_button->setFont(font);
@ -442,7 +440,7 @@ EditStation::EditStation(QString sname,QWidget *parent)
this,SLOT(editBackupsData())); this,SLOT(editBackupsData()));
// //
// Ok Button // Ok Button
// //
station_ok_button=new QPushButton(this); station_ok_button=new QPushButton(this);
station_ok_button->setDefault(true); station_ok_button->setDefault(true);
@ -451,7 +449,7 @@ EditStation::EditStation(QString sname,QWidget *parent)
connect(station_ok_button,SIGNAL(clicked()),this,SLOT(okData())); connect(station_ok_button,SIGNAL(clicked()),this,SLOT(okData()));
// //
// Cancel Button // Cancel Button
// //
station_cancel_button=new QPushButton(this); station_cancel_button=new QPushButton(this);
station_cancel_button->setFont(font); station_cancel_button->setFont(font);
@ -461,6 +459,7 @@ EditStation::EditStation(QString sname,QWidget *parent)
// //
// Populate Fields // Populate Fields
// //
caeStationActivatedData(station_station->caeStation());
station_name_edit->setText(station_station->name()); station_name_edit->setText(station_station->name());
station_short_name_edit->setText(station_station->shortName()); station_short_name_edit->setText(station_station->shortName());
station_description_edit->setText(station_station->description()); station_description_edit->setText(station_station->description());
@ -640,7 +639,6 @@ void EditStation::caeStationActivatedData(const QString &station_name)
station_cue_sel->setDisabled(true); station_cue_sel->setDisabled(true);
station_cue_sel->setDisabled(true); station_cue_sel->setDisabled(true);
} }
} }