summaryrefslogtreecommitdiffstats
path: root/logic/launch/steps/Update.cpp
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2015-07-26 17:55:29 +0200
committerPetr Mrázek <peterix@gmail.com>2015-07-26 17:55:29 +0200
commitd8caab515aa641ec901592d40b5d30c6dfd282f5 (patch)
tree612b322374083309027204b656d4dc0a78780de8 /logic/launch/steps/Update.cpp
parent6310f6569c2630f27ad72dc0a5fef9f9fec5a88c (diff)
downloadMultiMC-d8caab515aa641ec901592d40b5d30c6dfd282f5.tar
MultiMC-d8caab515aa641ec901592d40b5d30c6dfd282f5.tar.gz
MultiMC-d8caab515aa641ec901592d40b5d30c6dfd282f5.tar.lz
MultiMC-d8caab515aa641ec901592d40b5d30c6dfd282f5.tar.xz
MultiMC-d8caab515aa641ec901592d40b5d30c6dfd282f5.zip
GH-1053 add back update progress dialog
Diffstat (limited to 'logic/launch/steps/Update.cpp')
-rw-r--r--logic/launch/steps/Update.cpp11
1 files changed, 9 insertions, 2 deletions
diff --git a/logic/launch/steps/Update.cpp b/logic/launch/steps/Update.cpp
index 069b4f41..4901f001 100644
--- a/logic/launch/steps/Update.cpp
+++ b/logic/launch/steps/Update.cpp
@@ -22,12 +22,19 @@ void Update::executeTask()
if(m_updateTask)
{
connect(m_updateTask.get(), SIGNAL(finished()), this, SLOT(updateFinished()));
- m_updateTask->start();
+ connect(m_updateTask.get(), &Task::progress, this, &Task::setProgress);
+ connect(m_updateTask.get(), &Task::status, this, &Task::setStatus);
+ emit progressReportingRequest();
return;
}
emitSucceeded();
}
+void Update::proceed()
+{
+ m_updateTask->start();
+}
+
void Update::updateFinished()
{
if(m_updateTask->successful())
@@ -40,4 +47,4 @@ void Update::updateFinished()
emit logLine(reason, MessageLevel::Fatal);
emitFailed(reason);
}
-} \ No newline at end of file
+}