5da87d1904
Beginning with efa3fbff39, we separated
the failing and the aborting signals, as they can mean different
things in certain contexts. Still, some places are not yet changed to
reflect this modification. This can cause aborting of progress dialogs
to not work, instead making the application hang in an unusable satte.
This goes through some places where it's not hooked up yet, fixing their
behaviour in those kinds of situation.
60 lines
1.5 KiB
C++
60 lines
1.5 KiB
C++
/* 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.
|
|
*/
|
|
|
|
#pragma once
|
|
|
|
#include <QObject>
|
|
#include <QList>
|
|
#include <QUrl>
|
|
|
|
#include "net/NetJob.h"
|
|
#include "tasks/Task.h"
|
|
#include "minecraft/VersionFilterData.h"
|
|
#include <quazip/quazip.h>
|
|
|
|
class MinecraftVersion;
|
|
class MinecraftInstance;
|
|
|
|
// FIXME: This looks very similar to a SequentialTask. Maybe we can reduce code duplications? :^)
|
|
|
|
class MinecraftUpdate : public Task
|
|
{
|
|
Q_OBJECT
|
|
public:
|
|
explicit MinecraftUpdate(MinecraftInstance *inst, QObject *parent = 0);
|
|
virtual ~MinecraftUpdate() {};
|
|
|
|
void executeTask() override;
|
|
bool canAbort() const override;
|
|
|
|
private
|
|
slots:
|
|
bool abort() override;
|
|
void subtaskSucceeded();
|
|
void subtaskFailed(QString error);
|
|
|
|
private:
|
|
void next();
|
|
|
|
private:
|
|
MinecraftInstance *m_inst = nullptr;
|
|
QList<std::shared_ptr<Task>> m_tasks;
|
|
QString m_preFailure;
|
|
int m_currentTask = -1;
|
|
bool m_abort = false;
|
|
bool m_failed_out_of_order = false;
|
|
QString m_fail_reason;
|
|
};
|