summaryrefslogtreecommitdiffstats
path: root/application
diff options
context:
space:
mode:
Diffstat (limited to 'application')
-rw-r--r--application/MainWindow.cpp4
-rw-r--r--application/dialogs/UpdateDialog.cpp4
-rw-r--r--application/dialogs/UpdateDialog.h8
3 files changed, 8 insertions, 8 deletions
diff --git a/application/MainWindow.cpp b/application/MainWindow.cpp
index 8084f361..4c9a53a6 100644
--- a/application/MainWindow.cpp
+++ b/application/MainWindow.cpp
@@ -584,8 +584,8 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWi
if (!skin_dls.isEmpty())
{
auto job = new NetJob("Startup player skins download");
- connect(job, SIGNAL(succeeded()), SLOT(skinJobFinished()));
- connect(job, SIGNAL(failed()), SLOT(skinJobFinished()));
+ connect(job, &NetJob::succeeded, this, &MainWindow::skinJobFinished);
+ connect(job, &NetJob::failed, this, &MainWindow::skinJobFinished);
for (auto action : skin_dls)
{
job->addNetAction(action);
diff --git a/application/dialogs/UpdateDialog.cpp b/application/dialogs/UpdateDialog.cpp
index f7e0bcd6..31f2de29 100644
--- a/application/dialogs/UpdateDialog.cpp
+++ b/application/dialogs/UpdateDialog.cpp
@@ -165,9 +165,9 @@ void UpdateDialog::changelogLoaded()
ui->changelogBrowser->setHtml(html);
}
-void UpdateDialog::changelogFailed()
+void UpdateDialog::changelogFailed(QString reason)
{
- ui->changelogBrowser->setHtml(tr("<p align=\"center\" <span style=\"font-size:22pt;\">Failed to fetch changelog...</span></p>"));
+ ui->changelogBrowser->setHtml(tr("<p align=\"center\" <span style=\"font-size:22pt;\">Failed to fetch changelog... Error: %1</span></p>").arg(reason));
}
void UpdateDialog::on_btnUpdateLater_clicked()
diff --git a/application/dialogs/UpdateDialog.h b/application/dialogs/UpdateDialog.h
index 2ab2ff7c..b92c7473 100644
--- a/application/dialogs/UpdateDialog.h
+++ b/application/dialogs/UpdateDialog.h
@@ -48,13 +48,13 @@ public slots:
/// Starts loading the changelog
void loadChangelog();
-
+
/// Slot for when the chengelog loads successfully.
void changelogLoaded();
-
+
/// Slot for when the chengelog fails to load...
- void changelogFailed();
-
+ void changelogFailed(QString reason);
+
private:
ByteArrayDownloadPtr changelogDownload;
NetJobPtr dljob;