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

2018-10-26 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Fixed a regression in rdairplay(1) that caused to the
	'Enter Password' dialog to be dispplayed when exiting even if
	no exit password had been set.
	* Fixed a regression in rdairplay(1) that caused the application
	to be closed even if an incorrect response was entered in the
	'Enter Password' dialog.
This commit is contained in:
Fred Gleason 2018-10-26 15:38:01 -04:00
parent 501ed6ae1f
commit 0ae1d73b35
3 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -17917,3 +17917,10 @@
2018-10-26 Fred Gleason <fredg@paravelsystems.com>
* Added a warning when starting a module if the host does not
have a corresponding entry in the database.
2018-10-26 Fred Gleason <fredg@paravelsystems.com>
* Fixed a regression in rdairplay(1) that caused to the
'Enter Password' dialog to be dispplayed when exiting even if
no exit password had been set.
* Fixed a regression in rdairplay(1) that caused the application
to be closed even if an incorrect response was entered in the
'Enter Password' dialog.

6
lib/rdairplay_conf.cpp
View File

@ -773,7 +773,11 @@ bool RDAirPlayConf::exitPasswordValid(const QString &passwd) const
sql=QString("select EXIT_PASSWORD from `")+air_tablename+"` where "+
"STATION=\""+RDEscapeString(air_station)+"\" && "+
"EXIT_PASSWORD=PASSWORD(\""+RDEscapeString(passwd)+"\")";
"((EXIT_PASSWORD=PASSWORD(\""+RDEscapeString(passwd)+"\"))";
if(passwd.isEmpty()) {
sql+="||(EXIT_PASSWORD is null)";
}
sql+=")";
q=new RDSqlQuery(sql);
if(q->size()>0) {
delete q;

1
rdairplay/rdairplay.cpp
View File

@ -2130,6 +2130,7 @@ void MainWidget::closeEvent(QCloseEvent *e)
RDGetPasswd *gw=new RDGetPasswd(&passwd,this);
gw->exec();
if(!rda->airplayConf()->exitPasswordValid(passwd)) {
e->ignore();
return;
}
rda->airplayConf()->setExitCode(RDAirPlayConf::ExitClean);