diff options
author | Petr Mrázek <peterix@gmail.com> | 2014-05-11 12:37:21 +0200 |
---|---|---|
committer | Petr Mrázek <peterix@gmail.com> | 2014-06-09 01:38:30 +0200 |
commit | 69c3e7111f93290d1278d6116e9fd50079b4fe79 (patch) | |
tree | cbaed3022e8705f1da29777afea0fca16c1abe60 /logic/OneSixUpdate.h | |
parent | 92abe4c603e1f4931cd02ae6b752cb7054d8e30d (diff) | |
download | PrismLauncher-69c3e7111f93290d1278d6116e9fd50079b4fe79.tar.gz PrismLauncher-69c3e7111f93290d1278d6116e9fd50079b4fe79.tar.bz2 PrismLauncher-69c3e7111f93290d1278d6116e9fd50079b4fe79.zip |
Make 1.6+ work with new instance format.
Diffstat (limited to 'logic/OneSixUpdate.h')
-rw-r--r-- | logic/OneSixUpdate.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/logic/OneSixUpdate.h b/logic/OneSixUpdate.h index 00f7c135..139143db 100644 --- a/logic/OneSixUpdate.h +++ b/logic/OneSixUpdate.h @@ -36,9 +36,7 @@ public: private slots: - void versionFileStart(); - void versionFileFinished(); - void versionFileFailed(); + void versionUpdateFailed(QString reason); void jarlibStart(); void jarlibFinished(); @@ -58,12 +56,14 @@ slots: void stripJar(QString origPath, QString newPath); bool MergeZipFiles(QuaZip *into, QString from); private: - NetJobPtr specificVersionDownloadJob; NetJobPtr jarlibDownloadJob; NetJobPtr legacyDownloadJob; - // target version, determined during this task + /// target version, determined during this task std::shared_ptr<MinecraftVersion> targetVersion; + /// the task that is spawned for version updates + std::shared_ptr<Task> versionUpdateTask; + OneSixInstance *m_inst = nullptr; QString jarHashOnEntry; QList<FMLlib> fmlLibsToProcess; |