diff options
author | Petr Mrázek <peterix@gmail.com> | 2014-01-18 22:11:33 +0100 |
---|---|---|
committer | Petr Mrázek <peterix@gmail.com> | 2014-01-18 22:11:33 +0100 |
commit | 3fabb11f4c59baffb14db00d338d9efe342e277e (patch) | |
tree | c33d242761d31879f12821daab4d4f714a47b698 /logic/OneSixUpdate.cpp | |
parent | 8650aa81f06d9e229764b200f1dca135412c2ec1 (diff) | |
download | MultiMC-3fabb11f4c59baffb14db00d338d9efe342e277e.tar MultiMC-3fabb11f4c59baffb14db00d338d9efe342e277e.tar.gz MultiMC-3fabb11f4c59baffb14db00d338d9efe342e277e.tar.lz MultiMC-3fabb11f4c59baffb14db00d338d9efe342e277e.tar.xz MultiMC-3fabb11f4c59baffb14db00d338d9efe342e277e.zip |
Marginally improve OneSix offline mode launch
While reconstructing assets, skip files that don't exist.
Report missing OneSix native libraries.
Diffstat (limited to 'logic/OneSixUpdate.cpp')
-rw-r--r-- | logic/OneSixUpdate.cpp | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/logic/OneSixUpdate.cpp b/logic/OneSixUpdate.cpp index ee355308..0119ab07 100644 --- a/logic/OneSixUpdate.cpp +++ b/logic/OneSixUpdate.cpp @@ -348,18 +348,26 @@ void OneSixUpdate::prepareForLaunch() "it or changing the version."); return; } -/* - * emitFailed("Could not create the native library folder:\n" + natives_dir_raw + - "\nMake sure MultiMC has appropriate permissions and there is enough space " - "on the storage device."); -*/ + /* + * emitFailed("Could not create the native library folder:\n" + natives_dir_raw + + "\nMake sure MultiMC has appropriate permissions and there is enough + space " + "on the storage device."); + */ for (auto lib : version->getActiveNativeLibs()) { + if (!lib->filesExist()) + { + emitFailed("Native library is missing some files:\n" + lib->storagePath() + + "\n\nRun the instance at least once in online mode to get all the " + "required files."); + return; + } if (!lib->extractTo(natives_dir_raw)) { emitFailed("Could not extract the native library:\n" + lib->storagePath() + " to " + natives_dir_raw + - "\nMake sure MultiMC has appropriate permissions and there is enough " + "\n\nMake sure MultiMC has appropriate permissions and there is enough " "space on the storage device."); return; } |