From 526a511f455234152ca9b5bc8c60d3c82cbfa417 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Sat, 4 Jul 2015 20:02:43 +0200 Subject: GH-1053 move instance update into the launch task (BaseLauncher) --- logic/minecraft/LegacyInstance.cpp | 2 +- logic/minecraft/LegacyInstance.h | 2 +- logic/minecraft/OneSixInstance.cpp | 2 +- logic/minecraft/OneSixInstance.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'logic/minecraft') diff --git a/logic/minecraft/LegacyInstance.cpp b/logic/minecraft/LegacyInstance.cpp index 0eb379dc..3fe51a4a 100644 --- a/logic/minecraft/LegacyInstance.cpp +++ b/logic/minecraft/LegacyInstance.cpp @@ -95,7 +95,7 @@ std::shared_ptr LegacyInstance::doUpdate() return std::shared_ptr(new LegacyUpdate(this, this)); } -BaseLauncher *LegacyInstance::prepareForLaunch(AuthSessionPtr account) +std::shared_ptr LegacyInstance::prepareForLaunch(AuthSessionPtr account) { QString launchScript; QIcon icon = ENV.icons()->getIcon(iconKey()); diff --git a/logic/minecraft/LegacyInstance.h b/logic/minecraft/LegacyInstance.h index 236771f4..a8363e58 100644 --- a/logic/minecraft/LegacyInstance.h +++ b/logic/minecraft/LegacyInstance.h @@ -111,7 +111,7 @@ public: virtual void setShouldUpdate(bool val) override; virtual std::shared_ptr doUpdate() override; - virtual BaseLauncher *prepareForLaunch(AuthSessionPtr account) override; + virtual std::shared_ptr prepareForLaunch(AuthSessionPtr account) override; virtual void cleanupAfterRun() override; virtual QString getStatusbarDescription() override; diff --git a/logic/minecraft/OneSixInstance.cpp b/logic/minecraft/OneSixInstance.cpp index fd3df715..63bc071f 100644 --- a/logic/minecraft/OneSixInstance.cpp +++ b/logic/minecraft/OneSixInstance.cpp @@ -123,7 +123,7 @@ QStringList OneSixInstance::processMinecraftArgs(AuthSessionPtr session) return parts; } -BaseLauncher *OneSixInstance::prepareForLaunch(AuthSessionPtr session) +std::shared_ptr OneSixInstance::prepareForLaunch(AuthSessionPtr session) { QString launchScript; QIcon icon = ENV.icons()->getIcon(iconKey()); diff --git a/logic/minecraft/OneSixInstance.h b/logic/minecraft/OneSixInstance.h index 5c71687d..3825ba6a 100644 --- a/logic/minecraft/OneSixInstance.h +++ b/logic/minecraft/OneSixInstance.h @@ -49,7 +49,7 @@ public: virtual QString instanceConfigFolder() const override; virtual std::shared_ptr doUpdate() override; - virtual BaseLauncher *prepareForLaunch(AuthSessionPtr account) override; + virtual std::shared_ptr prepareForLaunch(AuthSessionPtr account) override; virtual void cleanupAfterRun() override; -- cgit v1.2.3