Merge branch 'develop' into fix/network_and_signals
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
This commit is contained in:
		| @@ -1,8 +1,9 @@ | ||||
| // SPDX-License-Identifier: GPL-3.0-only | ||||
| /* | ||||
|  *  PolyMC - Minecraft Launcher | ||||
|  *  Prism Launcher - Minecraft Launcher | ||||
|  *  Copyright (c) 2022 flowln <flowlnlnln@gmail.com> | ||||
|  *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net> | ||||
|  *  Copyright (C) 2023 Rachel Powers <508861+Ryex@users.noreply.github.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 | ||||
| @@ -22,6 +23,7 @@ | ||||
|  *      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 | ||||
|  * | ||||
| @@ -36,6 +38,8 @@ | ||||
|  | ||||
| #pragma once | ||||
|  | ||||
| #include <chrono> | ||||
|  | ||||
| #include "HttpMetaCache.h" | ||||
| #include "NetAction.h" | ||||
| #include "Sink.h" | ||||
| @@ -80,6 +84,10 @@ class Download : public NetAction { | ||||
|    private: | ||||
|     std::unique_ptr<Sink> m_sink; | ||||
|     Options m_options; | ||||
|  | ||||
|     std::chrono::steady_clock m_clock; | ||||
|     std::chrono::time_point<std::chrono::steady_clock> m_last_progress_time; | ||||
|     qint64 m_last_progress_bytes; | ||||
| }; | ||||
| }  // namespace Net | ||||
|  | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 Rachel Powers
					Rachel Powers