Fix minor bugs when switching branches

Author: LRFLEW

mainwindow.cpp

@@ -16,12 +16,9 @@ MainWindow::MainWindow(QWidget *parent) :
     ui->progressBar->setHidden(true);
     connect(ui->launchButton, &QPushButton::clicked, this, &MainWindow::launch);
 
-#ifndef Q_OS_OSX
-    ui->splash->setScaledContents(true);
-#endif
-
     connect(&updater, &Updater::installed, [this]{ ui->progressBar->setHidden(true); ui->launchButton->setEnabled(true); });
-    connect(&updater, &Updater::error, [this](QString error){ qDebug() << error; ui->errorLabel->setText(error); ui->launchButton->setEnabled(true); });
+    connect(&updater, &Updater::error, [this](QString error){
+        qDebug() << error; ui->errorLabel->setText(error); ui->progressBar->setHidden(true); ui->launchButton->setEnabled(true); });
     connect(&updater, &Updater::downloadProgress, [this](qint64 bytesReceived, qint64 bytesTotal){
         ui->progressBar->setHidden(false); ui->progressBar->setMaximum(bytesTotal); ui->progressBar->setValue(bytesReceived); });
 
@@ -43,7 +40,8 @@ void MainWindow::on_optionsButton_clicked() {
     }
 
     Configuration config(&updater.settings, dir.filePath(QStringLiteral("config.ini")));
-    connect(&config, &Configuration::redownload, [this]{ ui->launchButton->setEnabled(false); updater.download(); });
+    connect(&config, &Configuration::redownload, [this]{ ui->launchButton->setEnabled(false);
+        ui->errorLabel->setText(QStringLiteral("")); updater.download(); ui->progressBar->setHidden(true); });
     config.exec();
 }
 

mainwindow.ui

@@ -53,6 +53,9 @@
       <property name="pixmap">
        <pixmap resource="resources.qrc">:/splash.png</pixmap>
       </property>
+      <property name="scaledContents">
+       <bool>true</bool>
+      </property>
       <property name="alignment">
        <set>Qt::AlignBottom|Qt::AlignHCenter</set>
       </property>

updater.cpp

@@ -25,6 +25,10 @@
 Updater::Updater(QObject *parent) : QObject(parent)
 {
     connect(&net, &QNetworkAccessManager::sslErrors, [](QNetworkReply * reply, const QList<QSslError> & errors){Q_UNUSED(reply); qDebug() << errors;});
+
+    QNetworkRequest urequest(QStringLiteral("https://api.github.com/repos/LRFLEW/OpenRCT2Launcher/releases/latest"));
+    update = net.get(urequest);
+    connect(update, &QNetworkReply::finished, this, &Updater::receivedUpdate);
 }
 
 void Updater::queryDownloads(QString flavor) {
@@ -47,15 +51,10 @@ void Updater::queryDownloads(QString flavor) {
 }
 
 void Updater::download() {
-    if (update != nullptr) update->abort(), update->deleteLater(), update = nullptr;
     if (api != nullptr) api->abort(), api->deleteLater(), api = nullptr;
     if (bundle != nullptr) bundle->abort(), bundle->deleteLater(), bundle = nullptr;
 
     queryDownloads(QStringLiteral(OPENRCT2_FLAVOR));
-
-    QNetworkRequest urequest(QStringLiteral("https://api.github.com/repos/LRFLEW/OpenRCT2Launcher/releases/latest"));
-    update = net.get(urequest);
-    connect(update, &QNetworkReply::finished, this, &Updater::receivedUpdate);
 }
 
 void Updater::receivedUpdate() {
@@ -105,8 +104,10 @@ void Updater::receivedUpdate() {
 
 void Updater::receivedAPI() {
     if (api->error() != QNetworkReply::NoError) {
-        emit error(api->errorString());
-        api->deleteLater(), api = nullptr;
+        if (api->error() != QNetworkReply::OperationCanceledError) {
+            emit error(api->errorString());
+            api->deleteLater(), api = nullptr;
+        }
         return;
     }
 
@@ -151,8 +152,10 @@ void Updater::receivedAPI() {
 
 void Updater::receivedBundle() {
     if (bundle->error() != QNetworkReply::NoError) {
-        emit error(bundle->errorString());
-        bundle->deleteLater(), bundle = nullptr;
+        if (bundle->error() != QNetworkReply::OperationCanceledError) {
+            emit error(bundle->errorString());
+            bundle->deleteLater(), bundle = nullptr;
+        }
         return;
     }