diff main/MainWindow.cpp @ 1151:e0aa911e1a8a 3.0-integration

Update subrepos

--- a/main/MainWindow.cpp	Fri Apr 15 16:26:15 2016 +0100
+++ b/main/MainWindow.cpp	Fri Apr 22 11:15:46 2016 +0100
@@ -4436,15 +4436,13 @@
 }
 
 void
-MainWindow::alignmentFailed(QString transformName, QString message)
+MainWindow::alignmentFailed(QString message)
 {
-    emit hideSplash();
-
     QMessageBox::warning
         (this,
          tr("Failed to calculate alignment"),
-         tr("<b>Alignment calculation failed</b><p>Failed to calculate an audio alignment using transform \"%1\":<p>%2")
-         .arg(transformName).arg(message),
+         tr("<b>Alignment calculation failed</b><p>Failed to calculate an audio alignment:<p>%1")
+         .arg(message),
          QMessageBox::Ok);
 }