diff options
| author | Petr Mrázek <peterix@gmail.com> | 2015-07-04 20:02:43 +0200 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2015-07-04 20:02:43 +0200 |
| commit | 526a511f455234152ca9b5bc8c60d3c82cbfa417 (patch) | |
| tree | dfc64e8d84fff503f646e7422d6b7939475a6dca /logic/minecraft | |
| parent | 5628d3d379785c9c6f4a595c70392d9b1e9ea4df (diff) | |
| download | MultiMC-526a511f455234152ca9b5bc8c60d3c82cbfa417.tar MultiMC-526a511f455234152ca9b5bc8c60d3c82cbfa417.tar.gz MultiMC-526a511f455234152ca9b5bc8c60d3c82cbfa417.tar.lz MultiMC-526a511f455234152ca9b5bc8c60d3c82cbfa417.tar.xz MultiMC-526a511f455234152ca9b5bc8c60d3c82cbfa417.zip | |
GH-1053 move instance update into the launch task (BaseLauncher)
Diffstat (limited to 'logic/minecraft')
| -rw-r--r-- | logic/minecraft/LegacyInstance.cpp | 2 | ||||
| -rw-r--r-- | logic/minecraft/LegacyInstance.h | 2 | ||||
| -rw-r--r-- | logic/minecraft/OneSixInstance.cpp | 2 | ||||
| -rw-r--r-- | logic/minecraft/OneSixInstance.h | 2 |
4 files changed, 4 insertions, 4 deletions
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<Task> LegacyInstance::doUpdate() return std::shared_ptr<Task>(new LegacyUpdate(this, this)); } -BaseLauncher *LegacyInstance::prepareForLaunch(AuthSessionPtr account) +std::shared_ptr<BaseLauncher> 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<Task> doUpdate() override; - virtual BaseLauncher *prepareForLaunch(AuthSessionPtr account) override; + virtual std::shared_ptr<BaseLauncher> 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<BaseLauncher> 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<Task> doUpdate() override; - virtual BaseLauncher *prepareForLaunch(AuthSessionPtr account) override; + virtual std::shared_ptr<BaseLauncher> prepareForLaunch(AuthSessionPtr account) override; virtual void cleanupAfterRun() override; |