0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NOISSUE fix issue with the narrator feature by splitting java and native libraries

Browse Source
This commit is contained in:
Petr Mrázek
2017-04-06 23:31:23 +02:00
parent dddc5cedf3
commit 8e58d61150
6 changed files with 49 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/logic/minecraft/onesix/OneSixInstance.cpp
View File

@@ -283,6 +283,8 @@ QStringList OneSixInstance::verboseDescription(AuthSessionPtr session)
printLibFile(file);
}
printLibFile(mainJarPath());
out << "";
out << "Native libraries:";
for(auto file: nativeJars)
{
printLibFile(file);

18
api/logic/minecraft/onesix/update/LibrariesTask.cpp
View File

@@ -35,19 +35,23 @@ void LibrariesTask::executeTask()
downloadJob.reset(job);
}
auto libs = profile->getLibraries();
auto metacache = ENV.metacache();
QList<LibraryPtr> brokenLocalLibs;
QStringList failedFiles;
for (auto lib : libs)
auto createJobs = [&](const QList<LibraryPtr> & libs)
{
auto dls = lib->getDownloads(currentSystem, metacache.get(), failedFiles, inst->getLocalLibraryPath());
for(auto dl : dls)
for (auto lib : libs)
{
downloadJob->addNetAction(dl);
auto dls = lib->getDownloads(currentSystem, metacache.get(), failedFiles, inst->getLocalLibraryPath());
for(auto dl : dls)
{
downloadJob->addNetAction(dl);
}
}
}
};
createJobs(profile->getLibraries());
createJobs(profile->getNativeLibraries());
// FIXME: this is never filled!!!!
if (!brokenLocalLibs.empty())
{