diff options
| author | Petr Mrázek <peterix@gmail.com> | 2014-02-24 00:28:59 +0100 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2014-02-24 00:28:59 +0100 |
| commit | e3d2e5fd7405baa8137e300e8cc817e70df172b7 (patch) | |
| tree | 1829794eec361e593d612017e4502a7cf95b4252 /logic/OneSixUpdate.cpp | |
| parent | 71467246079bd7545472bda161dcaf5549205d33 (diff) | |
| parent | 4883d1526222f9804f304f4cc189d6e44cb22b97 (diff) | |
| download | PrismLauncher-e3d2e5fd7405baa8137e300e8cc817e70df172b7.tar.gz PrismLauncher-e3d2e5fd7405baa8137e300e8cc817e70df172b7.tar.bz2 PrismLauncher-e3d2e5fd7405baa8137e300e8cc817e70df172b7.zip | |
Merge branch 'fix_ftb' into integration_json_and_tools
Diffstat (limited to 'logic/OneSixUpdate.cpp')
| -rw-r--r-- | logic/OneSixUpdate.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/logic/OneSixUpdate.cpp b/logic/OneSixUpdate.cpp index d3ac80c2..f87c65e7 100644 --- a/logic/OneSixUpdate.cpp +++ b/logic/OneSixUpdate.cpp @@ -35,7 +35,7 @@ #include "pathutils.h" #include <JlCompress.h> -OneSixUpdate::OneSixUpdate(BaseInstance *inst, QObject *parent) +OneSixUpdate::OneSixUpdate(OneSixInstance *inst, QObject *parent) : Task(parent), m_inst(inst) { } @@ -73,6 +73,11 @@ void OneSixUpdate::executeTask() void OneSixUpdate::versionFileStart() { + if (m_inst->providesVersionFile()) + { + jarlibStart(); + return; + } QLOG_INFO() << m_inst->name() << ": getting version file."; setStatus(tr("Getting the version files from Mojang...")); |