diff options
| author | Trial97 <alexandru.tripon97@gmail.com> | 2023-06-28 13:21:00 +0300 |
|---|---|---|
| committer | Trial97 <alexandru.tripon97@gmail.com> | 2023-06-28 13:21:00 +0300 |
| commit | c04cee7ff75730df2c859ecae4567abb4e98dcd4 (patch) | |
| tree | a0e3025c131099576f79efd6dfb79caf7b926975 /launcher/net/ByteArraySink.h | |
| parent | 2680dba0aa74abefea58903dadad6578381101cb (diff) | |
| parent | faec21d572549793293bf41127e384811f8a66dc (diff) | |
| download | PrismLauncher-c04cee7ff75730df2c859ecae4567abb4e98dcd4.tar.gz PrismLauncher-c04cee7ff75730df2c859ecae4567abb4e98dcd4.tar.bz2 PrismLauncher-c04cee7ff75730df2c859ecae4567abb4e98dcd4.zip | |
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feat/acknowledge_release_type
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
Diffstat (limited to 'launcher/net/ByteArraySink.h')
| -rw-r--r-- | launcher/net/ByteArraySink.h | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/launcher/net/ByteArraySink.h b/launcher/net/ByteArraySink.h index 501318a1..d6b17d60 100644 --- a/launcher/net/ByteArraySink.h +++ b/launcher/net/ByteArraySink.h @@ -1,7 +1,8 @@ // SPDX-License-Identifier: GPL-3.0-only /* - * PolyMC - Minecraft Launcher + * Prism Launcher - Minecraft Launcher * Copyright (c) 2022 flowln <flowlnlnln@gmail.com> + * Copyright (c) 2023 Trial97 <alexandru.tripon97@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 @@ -46,14 +47,17 @@ namespace Net { */ class ByteArraySink : public Sink { public: - ByteArraySink(QByteArray* output) : m_output(output){}; + ByteArraySink(std::shared_ptr<QByteArray> output) : m_output(output){}; virtual ~ByteArraySink() = default; public: auto init(QNetworkRequest& request) -> Task::State override { - m_output->clear(); + if (m_output) + m_output->clear(); + else + qWarning() << "ByteArraySink did not initialize the buffer because it's not addressable"; if (initAllValidators(request)) return Task::State::Running; return Task::State::Failed; @@ -61,7 +65,10 @@ class ByteArraySink : public Sink { auto write(QByteArray& data) -> Task::State override { - m_output->append(data); + if (m_output) + m_output->append(data); + else + qWarning() << "ByteArraySink did not write the buffer because it's not addressable"; if (writeAllValidators(data)) return Task::State::Running; return Task::State::Failed; @@ -69,7 +76,10 @@ class ByteArraySink : public Sink { auto abort() -> Task::State override { - m_output->clear(); + if (m_output) + m_output->clear(); + else + qWarning() << "ByteArraySink did not clear the buffer because it's not addressable"; failAllValidators(); return Task::State::Failed; } @@ -84,6 +94,6 @@ class ByteArraySink : public Sink { auto hasLocalData() -> bool override { return false; } private: - QByteArray* m_output; + std::shared_ptr<QByteArray> m_output; }; } // namespace Net |