aboutsummaryrefslogtreecommitdiff
path: root/launcher/minecraft/update
diff options
context:
space:
mode:
authorSefa Eyeoglu <contact@scrumplex.net>2022-10-08 20:12:40 +0200
committerGitHub <noreply@github.com>2022-10-08 20:12:40 +0200
commitfafc9cf9ca86fd66db09e9ccc1cdb53520fd7c16 (patch)
tree61de3976ba124736c1ad5d10f5d9c8b17537f394 /launcher/minecraft/update
parente436f471a074401be3a48f19eff577c040e9b192 (diff)
parent3111e6a7212ae914041fce6d851d7662975dc1be (diff)
downloadPrismLauncher-fafc9cf9ca86fd66db09e9ccc1cdb53520fd7c16.tar.gz
PrismLauncher-fafc9cf9ca86fd66db09e9ccc1cdb53520fd7c16.tar.bz2
PrismLauncher-fafc9cf9ca86fd66db09e9ccc1cdb53520fd7c16.zip
Merge pull request #1033 from Scrumplex/multi-arch-support
Diffstat (limited to 'launcher/minecraft/update')
-rw-r--r--launcher/minecraft/update/FoldersTask.cpp35
-rw-r--r--launcher/minecraft/update/LibrariesTask.cpp2
2 files changed, 36 insertions, 1 deletions
diff --git a/launcher/minecraft/update/FoldersTask.cpp b/launcher/minecraft/update/FoldersTask.cpp
index 22768bd9..b9ee9d98 100644
--- a/launcher/minecraft/update/FoldersTask.cpp
+++ b/launcher/minecraft/update/FoldersTask.cpp
@@ -1,3 +1,38 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ * PolyMC - Minecraft Launcher
+ * Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ *
+ * This file incorporates work covered by the following copyright and
+ * permission notice:
+ *
+ * Copyright 2013-2021 MultiMC Contributors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
#include "FoldersTask.h"
#include "minecraft/MinecraftInstance.h"
#include <QDir>
diff --git a/launcher/minecraft/update/LibrariesTask.cpp b/launcher/minecraft/update/LibrariesTask.cpp
index aa2bf407..3b129fe1 100644
--- a/launcher/minecraft/update/LibrariesTask.cpp
+++ b/launcher/minecraft/update/LibrariesTask.cpp
@@ -34,7 +34,7 @@ void LibrariesTask::executeTask()
emitFailed(tr("Null jar is specified in the metadata, aborting."));
return false;
}
- auto dls = lib->getDownloads(currentSystem, metacache.get(), errors, localPath);
+ auto dls = lib->getDownloads(inst->runtimeContext(), metacache.get(), errors, localPath);
for(auto dl : dls)
{
downloadJob->addNetAction(dl);