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

Resolved clonflict in 'ChangeLog'

Browse Source
This commit is contained in:
Fred Gleason 2018-10-28 18:15:29 -04:00
commit 1ef5f06ce7
2 changed files with 5 additions and 0 deletions

4
ChangeLog

@ -17927,3 +17927,7 @@
2018-10-28 Fred Gleason <fredg@paravelsystems.com>
* Fixed a regression that caused the bankground of blank Sound Panel
buttons to be black.
2018-10-28 Patrick Linstruth <patrick@deltecent.com>
* Fixed a regression in rdairplay(1) that caused the application
to be closed even if "No" was pressed in the 'Exit RDAirPlay?'
dialog.

1
rdairplay/rdairplay.cpp

@ -2141,6 +2141,7 @@ void MainWidget::closeEvent(QCloseEvent *e)
if(QMessageBox::question(this,"RDAirPlay",tr("Exit RDAirPlay?"),
QMessageBox::Yes,QMessageBox::No)!=
QMessageBox::Yes) {
e->setAccepted(false);
return;
}
for(unsigned i=0;i<air_plugin_hosts.size();i++) {