Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-10-11 00:53:53 +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
parent d1b1bb5fb9 636f185202
commit 4d762b437e
2 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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();
}