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/OneSixUpdate.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/OneSixUpdate.h')
| -rw-r--r-- | logic/OneSixUpdate.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/logic/OneSixUpdate.h b/logic/OneSixUpdate.h index bc717a94..3c18211e 100644 --- a/logic/OneSixUpdate.h +++ b/logic/OneSixUpdate.h @@ -29,7 +29,7 @@ class OneSixUpdate : public Task { Q_OBJECT public: - explicit OneSixUpdate(BaseInstance *inst, bool prepare_for_launch, QObject *parent = 0); + explicit OneSixUpdate(BaseInstance *inst, QObject *parent = 0); virtual void executeTask(); private @@ -49,9 +49,6 @@ slots: void assetsFinished(); void assetsFailed(); - // extract the appropriate libraries - void prepareForLaunch(); - private: NetJobPtr specificVersionDownloadJob; NetJobPtr jarlibDownloadJob; @@ -59,5 +56,4 @@ private: // target version, determined during this task std::shared_ptr<MinecraftVersion> targetVersion; BaseInstance *m_inst = nullptr; - bool m_only_prepare = false; }; |