From c6864e0a580793f29c7d2cf180fc0f2ac2fc2b2c Mon Sep 17 00:00:00 2001 From: Shane Kearns Date: Wed, 25 Apr 2012 15:31:11 +0100 Subject: [PATCH] QNetworkAccessManager - ensure abort reaches QFtp Previously, we just disconnected signals from QFtp and allowed it to continue downloading in the background. Task-number: QTBUG-25494 Change-Id: I891c2fff88ef1ee554d1ccf821a3f7998eeb8406 Reviewed-by: Martin Petersson --- src/network/access/qnetworkaccessftpbackend.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/network/access/qnetworkaccessftpbackend.cpp b/src/network/access/qnetworkaccessftpbackend.cpp index 4aa491db0c..93dd912f5a 100644 --- a/src/network/access/qnetworkaccessftpbackend.cpp +++ b/src/network/access/qnetworkaccessftpbackend.cpp @@ -107,6 +107,9 @@ QNetworkAccessFtpBackend::QNetworkAccessFtpBackend() QNetworkAccessFtpBackend::~QNetworkAccessFtpBackend() { + //if backend destroyed while in use, then abort (this is the code path from QNetworkReply::abort) + if (ftp && state != Disconnecting) + ftp->abort(); disconnectFromFtp(); }