diff options
author | Jan Dalheimer <jan@dalheimer.de> | 2014-02-01 19:58:13 +0100 |
---|---|---|
committer | Jan Dalheimer <jan@dalheimer.de> | 2014-02-01 19:58:13 +0100 |
commit | 983a40698c47739fee3786cf54c917004523ea36 (patch) | |
tree | 4a0d73577afbf430934cd878ff23674aaa7aea74 /logic/LegacyInstance.h | |
parent | 866d7029afa10293a57d71aecbe3629399c95d06 (diff) | |
parent | 1936bd181f57a554ce0dd757ffe9419100eb47f4 (diff) | |
download | PrismLauncher-983a40698c47739fee3786cf54c917004523ea36.tar.gz PrismLauncher-983a40698c47739fee3786cf54c917004523ea36.tar.bz2 PrismLauncher-983a40698c47739fee3786cf54c917004523ea36.zip |
Merge remote-tracking branch 'upstream/feature_derpstances' into feature_derpstances
Diffstat (limited to 'logic/LegacyInstance.h')
-rw-r--r-- | logic/LegacyInstance.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/logic/LegacyInstance.h b/logic/LegacyInstance.h index 1e7d9eb6..636addeb 100644 --- a/logic/LegacyInstance.h +++ b/logic/LegacyInstance.h @@ -76,9 +76,9 @@ public: virtual bool shouldUpdate() const override; virtual void setShouldUpdate(bool val) override; - virtual std::shared_ptr<Task> doUpdate(bool only_prepare) override; + virtual std::shared_ptr<Task> doUpdate() override; - virtual MinecraftProcess *prepareForLaunch(MojangAccountPtr account) override; + virtual MinecraftProcess *prepareForLaunch(AuthSessionPtr account) override; virtual void cleanupAfterRun() override; virtual QDialog *createModEditDialog(QWidget *parent) override; |