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

Fixed conflict in 'ChangeLog'

Browse Source
This commit is contained in:
Fred Gleason 2018-10-30 13:02:17 -04:00
commit 4d762b437e
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -17642,8 +17642,6 @@
2018-09-20 Fred Gleason <fredg@paravelsystems.com> 2018-09-20 Fred Gleason <fredg@paravelsystems.com>
* Corrected an omission in the documentation of the * Corrected an omission in the documentation of the
'Start Button' ['PB'] RML. 'Start Button' ['PB'] RML.
<<<<<<< HEAD
<<<<<<< HEAD
2018-10-01 Fred Gleason <fredg@paravelsystems.com> 2018-10-01 Fred Gleason <fredg@paravelsystems.com>
* Applied a PR from Patrick Linstruth <patrick@deltecent.com> that * Applied a PR from Patrick Linstruth <patrick@deltecent.com> that
fixed a regression where the 'Stop' button would fail to function fixed a regression where the 'Stop' button would fail to function
@ -17812,7 +17810,6 @@
* Disabled the 'More than half the audio will be faded...' warning * Disabled the 'More than half the audio will be faded...' warning
in the 'Edit Audio' dialog in rdlibrary(1) if the 'No Fade on in the 'Edit Audio' dialog in rdlibrary(1) if the 'No Fade on
Segue Out' checkbox is ticked. Segue Out' checkbox is ticked.
<<<<<<< HEAD
2018-10-17 Fred Gleason <fredg@paravelsystems.com> 2018-10-17 Fred Gleason <fredg@paravelsystems.com>
* Fixed a bug in rivwebcapi's 'RD_ListCartCuts()' and * Fixed a bug in rivwebcapi's 'RD_ListCartCuts()' and
'RD_ListCartsCuts()' functions that threw a segfault if the WebAPI 'RD_ListCartsCuts()' functions that threw a segfault if the WebAPI
@ -17852,7 +17849,6 @@
2018-10-19 Fred Gleason <fredg@paravelsystems.com> 2018-10-19 Fred Gleason <fredg@paravelsystems.com>
* Removed check for Win32 installer from 'configure.ac'. * Removed check for Win32 installer from 'configure.ac'.
* Removed win32 clauses from '.pro' files. * Removed win32 clauses from '.pro' files.
<<<<<<< HEAD
2018-10-19 Fred Gleason <fredg@paravelsystems.com> 2018-10-19 Fred Gleason <fredg@paravelsystems.com>
* Removed the 'make slack' target. * Removed the 'make slack' target.
* Removed the 'make slax' target. * Removed the 'make slax' target.
@ -17895,8 +17891,6 @@
2018-10-23 Fred Gleason <fredg@paravelsystems.com> 2018-10-23 Fred Gleason <fredg@paravelsystems.com>
* Fixed a bug in 'configure.ac' that caused detection of FLAC * Fixed a bug in 'configure.ac' that caused detection of FLAC
support to always fail. support to always fail.
<<<<<<< HEAD
<<<<<<< HEAD
2018-10-24 Fred Gleason <fredg@paravelsystems.com> 2018-10-24 Fred Gleason <fredg@paravelsystems.com>
* Consolidated the implementation of the 'RDProfile' class into * Consolidated the implementation of the 'RDProfile' class into
two files. two files.
@ -17956,3 +17950,5 @@
times. times.
2018-10-29 Fred Gleason <fredg@paravelsystems.com> 2018-10-29 Fred Gleason <fredg@paravelsystems.com>
* Incremented the package version to 3.0.0alpha01. * Incremented the package version to 3.0.0alpha01.
2018-10-30 Patrick Linstruth <patrick@deltecent.com>
* Added display of warnings from rddbmgr(8) to rddbconfig(8).

16
utils/rddbconfig/rddbconfig.cpp
View File

@ -189,14 +189,22 @@ void MainWidget::mismatchData()
modifyProcess.start("rddbmgr", args); modifyProcess.start("rddbmgr", args);
modifyProcess.waitForFinished(-1); modifyProcess.waitForFinished(-1);
QApplication::restoreOverrideCursor(); QApplication::restoreOverrideCursor();
QString stderr=modifyProcess.readAllStandardError();
if (modifyProcess.exitCode()) { if (modifyProcess.exitCode()) {
QMessageBox::critical(this,tr("RDDbConfig Error"), QMessageBox::critical(this,tr("RDDbConfig Error"),stderr);
QString(modifyProcess.readAllStandardError()));
} }
else { else {
QMessageBox::information(this,"Database Modified Successfully", if(!stderr.isEmpty()) {
QMessageBox::information(this,"Database Modified with Warnings",
QString().sprintf("Modified database to version %d with warnings:\n\n%s",
RD_VERSION_DATABASE,(const char *)stderr));
}
else {
QMessageBox::information(this,"Database Modified Successfully",
QString().sprintf("Modified database to version %d", RD_VERSION_DATABASE));
}
rd_config->log("rddbconfig",RDConfig::LogInfo,
QString().sprintf("Modified database to version %d", RD_VERSION_DATABASE)); QString().sprintf("Modified database to version %d", RD_VERSION_DATABASE));
rd_config->log("rddbconfig",RDConfig::LogInfo,QString().sprintf("Modified database to version %d", RD_VERSION_DATABASE));
emit dbChanged(); emit dbChanged();
} }