merge origin/develop

Signed-off-by: kumquat-ir <66188216+kumquat-ir@users.noreply.github.com>

1 files changed, 10 insertions, 0 deletions

diff --git a/launcher/net/Upload.cpp b/launcher/net/Upload.cpp
index 12dd1e78..cfda4b4e 100644
--- a/launcher/net/Upload.cpp
+++ b/launcher/net/Upload.cpp
@@ -43,6 +43,16 @@
 
 namespace Net {
 
+    bool Upload::abort()
+    {
+        if (m_reply) {
+            m_reply->abort();
+        } else {
+            m_state = State::AbortedByUser;
+        }
+        return true;
+    }
+
     void Upload::downloadProgress(qint64 bytesReceived, qint64 bytesTotal) {
         setProgress(bytesReceived, bytesTotal);
     }