summaryrefslogtreecommitdiffstats
path: root/application
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2016-08-14 02:33:31 +0200
committerPetr Mrázek <peterix@gmail.com>2016-08-14 23:22:54 +0200
commit042f3ef55c0b469f438542152c4eb02b0789ea3c (patch)
tree03e0c15b200786558babd0fe58edac88ed1bfd1e /application
parent2f0441b3c1cd9fc3bcb176d2852da8f92a6e6777 (diff)
downloadMultiMC-042f3ef55c0b469f438542152c4eb02b0789ea3c.tar
MultiMC-042f3ef55c0b469f438542152c4eb02b0789ea3c.tar.gz
MultiMC-042f3ef55c0b469f438542152c4eb02b0789ea3c.tar.lz
MultiMC-042f3ef55c0b469f438542152c4eb02b0789ea3c.tar.xz
MultiMC-042f3ef55c0b469f438542152c4eb02b0789ea3c.zip
GH-352 Make OneSix instance update downloads cancellable
Diffstat (limited to 'application')
-rw-r--r--application/InstanceWindow.cpp1
-rw-r--r--application/MainWindow.cpp1
2 files changed, 2 insertions, 0 deletions
diff --git a/application/InstanceWindow.cpp b/application/InstanceWindow.cpp
index 0b9d7019..6b24f488 100644
--- a/application/InstanceWindow.cpp
+++ b/application/InstanceWindow.cpp
@@ -212,6 +212,7 @@ void InstanceWindow::onFailed(QString reason)
void InstanceWindow::onProgressRequested(Task* task)
{
ProgressDialog progDialog(this);
+ progDialog.setSkipButton(true, tr("Abort"));
m_proc->proceed();
progDialog.execWithTask(task);
}
diff --git a/application/MainWindow.cpp b/application/MainWindow.cpp
index ce6f7181..92f2260b 100644
--- a/application/MainWindow.cpp
+++ b/application/MainWindow.cpp
@@ -1185,6 +1185,7 @@ void MainWindow::finalizeInstance(InstancePtr inst)
});
if(update)
{
+ loadDialog.setSkipButton(true, tr("Abort"));
loadDialog.execWithTask(update.get());
}
}