diff options
| author | Sefa Eyeoglu <contact@scrumplex.net> | 2022-05-21 12:06:34 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-21 12:06:34 +0200 |
| commit | b4707f46ad0e2381c4dc9477abf3229ebc4cad49 (patch) | |
| tree | e5d69dd4f862b12e3c0d5291f38fae1a024c35f6 /launcher/minecraft | |
| parent | 482e049ac7eb4d77c5c7a655b28820a2a643785d (diff) | |
| parent | ff9f3cb31ff75c2d657146cf8fe646084439fd0f (diff) | |
| download | PrismLauncher-b4707f46ad0e2381c4dc9477abf3229ebc4cad49.tar.gz PrismLauncher-b4707f46ad0e2381c4dc9477abf3229ebc4cad49.tar.bz2 PrismLauncher-b4707f46ad0e2381c4dc9477abf3229ebc4cad49.zip | |
Merge pull request #500 from flowln/net_refactor
Refactor a little the code in `launcher/net/` files
Diffstat (limited to 'launcher/minecraft')
| -rw-r--r-- | launcher/minecraft/AssetsUtils.cpp | 42 |
1 files changed, 31 insertions, 11 deletions
diff --git a/launcher/minecraft/AssetsUtils.cpp b/launcher/minecraft/AssetsUtils.cpp index 7290aeb4..15062c2b 100644 --- a/launcher/minecraft/AssetsUtils.cpp +++ b/launcher/minecraft/AssetsUtils.cpp @@ -1,16 +1,36 @@ -/* Copyright 2013-2021 MultiMC Contributors +// SPDX-License-Identifier: GPL-3.0-only +/* + * PolyMC - Minecraft Launcher + * Copyright (c) 2022 flowln <flowlnlnln@gmail.com> + * + * 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 + * 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 + * 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. + * 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 <QFileInfo> @@ -297,7 +317,7 @@ NetAction::Ptr AssetObject::getDownloadAction() auto rawHash = QByteArray::fromHex(hash.toLatin1()); objectDL->addValidator(new Net::ChecksumValidator(QCryptographicHash::Sha1, rawHash)); } - objectDL->m_total_progress = size; + objectDL->setProgress(objectDL->getProgress(), size); return objectDL; } return nullptr; |