Imported Upstream version 2.3.1

[minitube] / src / mainwindow.cpp

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index b03d59a8e5ced29be72f7a5bfca84fd7310a04b6..27959971075e608e00f190ac0251165fcc37d8d9 100644 (file)
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -1322,7 +1322,7 @@ void MainWindow::initPhonon() {
     volumeSlider->setAudioOutput(audioOutput);
     Phonon::createPath(mediaObject, audioOutput);
     QSettings settings;
-    audioOutput->setVolume(settings.value("volume", 1).toDouble());
+    audioOutput->setVolume(settings.value("volume", 1).toReal());
     // audioOutput->setMuted(settings.value("volumeMute").toBool());
 }
 #endif
@@ -1591,12 +1591,14 @@ void MainWindow::gotNewVersion(QString version) {
     QString checkedVersion = settings.value("checkedVersion").toString();
     if (checkedVersion == version) return;
 
-#ifdef APP_SIMPLEUPDATE
-    simpleUpdateDialog(version);
-#elif defined(APP_ACTIVATION) && !defined(APP_MAC)
+#ifdef APP_EXTRA
+#ifndef APP_MAC
     UpdateDialog *dialog = new UpdateDialog(version, this);
     dialog->show();
 #endif
+#else
+    simpleUpdateDialog(version);
+#endif
 }
 
 void MainWindow::simpleUpdateDialog(QString version) {