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

Merge branch 'deltecent-rddbconfig'

Browse Source
This commit is contained in:
Fred Gleason 2018-10-30 13:34:19 -04:00
commit 171246c81f
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>
* Corrected an omission in the documentation of the
'Start Button' ['PB'] RML.
<<<<<<< HEAD
<<<<<<< HEAD
2018-10-01 Fred Gleason <fredg@paravelsystems.com>
* Applied a PR from Patrick Linstruth <patrick@deltecent.com> that
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
in the 'Edit Audio' dialog in rdlibrary(1) if the 'No Fade on
Segue Out' checkbox is ticked.
<<<<<<< HEAD
2018-10-17 Fred Gleason <fredg@paravelsystems.com>
* Fixed a bug in rivwebcapi's 'RD_ListCartCuts()' and
'RD_ListCartsCuts()' functions that threw a segfault if the WebAPI
@ -17852,7 +17849,6 @@
2018-10-19 Fred Gleason <fredg@paravelsystems.com>
* Removed check for Win32 installer from 'configure.ac'.
* Removed win32 clauses from '.pro' files.
<<<<<<< HEAD
2018-10-19 Fred Gleason <fredg@paravelsystems.com>
* Removed the 'make slack' target.
* Removed the 'make slax' target.
@ -17895,8 +17891,6 @@
2018-10-23 Fred Gleason <fredg@paravelsystems.com>
* Fixed a bug in 'configure.ac' that caused detection of FLAC
support to always fail.
<<<<<<< HEAD
<<<<<<< HEAD
2018-10-24 Fred Gleason <fredg@paravelsystems.com>
* Consolidated the implementation of the 'RDProfile' class into
two files.
@ -17956,3 +17950,5 @@
times.
2018-10-29 Fred Gleason <fredg@paravelsystems.com>
* 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.waitForFinished(-1);
QApplication::restoreOverrideCursor();
QString stderr=modifyProcess.readAllStandardError();
if (modifyProcess.exitCode()) {
QMessageBox::critical(this,tr("RDDbConfig Error"),
QString(modifyProcess.readAllStandardError()));
QMessageBox::critical(this,tr("RDDbConfig Error"),stderr);
}
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));
rd_config->log("rddbconfig",RDConfig::LogInfo,QString().sprintf("Modified database to version %d", RD_VERSION_DATABASE));
emit dbChanged();
}