diff options
| author | Shane Kearns <ext-shane.2.kearns@nokia.com> | 2012-02-14 20:12:42 (GMT) |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-15 19:03:45 (GMT) |
| commit | 6c4c5709a3f6150c4e37f38c7e7fd980ab359a53 (patch) | |
| tree | a23e47cae9a0cc0e5b7213c956f9cf43779d905e /src/network | |
| parent | af8a22c53a095031c6d363882da373d2173201f5 (diff) | |
| download | Qt-6c4c5709a3f6150c4e37f38c7e7fd980ab359a53.zip Qt-6c4c5709a3f6150c4e37f38c7e7fd980ab359a53.tar.gz Qt-6c4c5709a3f6150c4e37f38c7e7fd980ab359a53.tar.bz2 | |
Abort FTP download, not the whole application
An old coding error meant that the C runtime abort() function was
being called instead of QFtp::abort() when cancelling an FTP download
using QNetworkReply::close()
Task-number: QTBUG-22820
Change-Id: Ib97fda9769b2b55a08c042c66c4444cb6216d2b1
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/network')
| -rw-r--r-- | src/network/access/qnetworkaccessftpbackend.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/network/access/qnetworkaccessftpbackend.cpp b/src/network/access/qnetworkaccessftpbackend.cpp index 7b7ebb5..6b9ce50 100644 --- a/src/network/access/qnetworkaccessftpbackend.cpp +++ b/src/network/access/qnetworkaccessftpbackend.cpp @@ -179,11 +179,7 @@ void QNetworkAccessFtpBackend::closeDownstreamChannel() { state = Disconnecting; if (operation() == QNetworkAccessManager::GetOperation) -#ifndef Q_OS_WINCE - abort(); -#else - exit(3); -#endif + ftp->abort(); } void QNetworkAccessFtpBackend::downstreamReadyWrite() |