From 042f3ef55c0b469f438542152c4eb02b0789ea3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= <peterix@gmail.com>
Date: Sun, 14 Aug 2016 02:33:31 +0200
Subject: GH-352 Make OneSix instance update downloads cancellable

---
 api/logic/launch/steps/Update.h | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

(limited to 'api/logic/launch/steps/Update.h')

diff --git a/api/logic/launch/steps/Update.h b/api/logic/launch/steps/Update.h
index 14928253..1739de47 100644
--- a/api/logic/launch/steps/Update.h
+++ b/api/logic/launch/steps/Update.h
@@ -16,6 +16,7 @@
 #pragma once
 
 #include <launch/LaunchStep.h>
+#include <QObjectPtr.h>
 #include <launch/LoggedProcess.h>
 #include <java/JavaChecker.h>
 
@@ -27,15 +28,16 @@ public:
 	explicit Update(LaunchTask *parent):LaunchStep(parent) {};
 	virtual ~Update() {};
 
-	virtual void executeTask();
-	virtual bool canAbort() const
-	{
-		return false;
-	}
-	virtual void proceed();
+	void executeTask() override;
+	bool canAbort() const override;
+	void proceed() override;
+public slots:
+	bool abort() override;
+
 private slots:
 	void updateFinished();
 
 private:
-	std::shared_ptr<Task> m_updateTask;
+	shared_qobject_ptr<Task> m_updateTask;
+	bool m_aborted = false;
 };
-- 
cgit v1.2.3