summaryrefslogtreecommitdiffstats
path: root/application/dialogs
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2015-04-26 13:47:14 +0200
committerPetr Mrázek <peterix@gmail.com>2015-04-26 18:33:29 +0200
commit84549ed8078bdbd029aa5a89facc0412b8b5e753 (patch)
tree3a5bd2727195f18c42cdb428421cab5fc6562d9d /application/dialogs
parentd5c79db12c326bd0175cd2990764948a536abbbb (diff)
downloadMultiMC-84549ed8078bdbd029aa5a89facc0412b8b5e753.tar
MultiMC-84549ed8078bdbd029aa5a89facc0412b8b5e753.tar.gz
MultiMC-84549ed8078bdbd029aa5a89facc0412b8b5e753.tar.lz
MultiMC-84549ed8078bdbd029aa5a89facc0412b8b5e753.tar.xz
MultiMC-84549ed8078bdbd029aa5a89facc0412b8b5e753.zip
GH-849 Further NetJob related fixes
Diffstat (limited to 'application/dialogs')
-rw-r--r--application/dialogs/UpdateDialog.cpp4
-rw-r--r--application/dialogs/UpdateDialog.h8
2 files changed, 6 insertions, 6 deletions
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;