mirror of
https://github.com/ElvishArtisan/rivendell.git
synced 2025-07-22 23:48:04 +02:00
Resolved clonflict in 'ChangeLog'
This commit is contained in:
commit
1ef5f06ce7
@ -17927,3 +17927,7 @@
|
|||||||
2018-10-28 Fred Gleason <fredg@paravelsystems.com>
|
2018-10-28 Fred Gleason <fredg@paravelsystems.com>
|
||||||
* Fixed a regression that caused the bankground of blank Sound Panel
|
* Fixed a regression that caused the bankground of blank Sound Panel
|
||||||
buttons to be black.
|
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.
|
||||||
|
@ -2141,6 +2141,7 @@ void MainWidget::closeEvent(QCloseEvent *e)
|
|||||||
if(QMessageBox::question(this,"RDAirPlay",tr("Exit RDAirPlay?"),
|
if(QMessageBox::question(this,"RDAirPlay",tr("Exit RDAirPlay?"),
|
||||||
QMessageBox::Yes,QMessageBox::No)!=
|
QMessageBox::Yes,QMessageBox::No)!=
|
||||||
QMessageBox::Yes) {
|
QMessageBox::Yes) {
|
||||||
|
e->setAccepted(false);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
for(unsigned i=0;i<air_plugin_hosts.size();i++) {
|
for(unsigned i=0;i<air_plugin_hosts.size();i++) {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user