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

Fixed conflict in 'ChangeLog'

Browse Source 
Signed-off-by: Fred Gleason <fredg@paraelsystems.com>
This commit is contained in:
Fred Gleason 2021-10-02 13:30:45 -04:00
commit a889427f95
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -22483,5 +22483,9 @@
* Added a '--show-styles' switch to all modules.
* Changed the default QStyle to 'Windows'.
2021-10-02 Fred Gleason <fredg@paravelsystems.com>
* Fixed a compile time warning in 'web/webget/webget.cpp'.
2021-10-02 Fred Gleason <fredg@paravelsystems.com>
* Fixed a regression in 'RDLibraryModel' that threw SQL errors
when attempting to the model when using MySQL 8.x.
* Added a 'qt5-qtstyleplugins' dependency to the 'rivendell'
RPM package.

3
lib/rdlibrarymodel.cpp
View File

@ -802,7 +802,8 @@ QString sql=QString("select distinct ")+
"`CUTS`.`TALK_START_POINT`,"+ // 27
"`CUTS`.`TALK_END_POINT`,"+ // 28
"`CUTS`.`DESCRIPTION`,"+ // 29
"`CART`.`NOTES` "+ // 30
"`CART`.`NOTES`,"+ // 30
"`CUTS`.`PLAY_ORDER` "+ // 31
"from `CART` "+
"left join `GROUPS` on `CART`.`GROUP_NAME`=`GROUPS`.`NAME` "+
"left join `CUTS` on `CART`.`NUMBER`=`CUTS`.`CART_NUMBER` "+

2
web/webget/webget.cpp
View File

@ -821,7 +821,7 @@ void MainObject::SaveSourceFile(const QString &filepath) const
// Move the data
//
while((n=read(src_fd,buffer,1024))>0) {
write(dst_fd,buffer,n);
RDCheckExitCode("webget service",write(dst_fd,buffer,n));
}
if(n<0) {
rda->syslog(LOG_WARNING,"error while reading source file \"%s\" for SaveWebgetFilesDirectory [%s]",