summaryrefslogtreecommitdiffstats
path: root/src/network/access
diff options
context:
space:
mode:
authorShane Kearns <ext-shane.2.kearns@nokia.com>2012-02-14 20:12:42 +0000
committerQt by Nokia <qt-info@nokia.com>2012-02-15 02:35:20 +0100
commita28c433b290dae1b3509ddf1eee616ba91ce221b (patch)
treef54978d0ba24c78b095a2436bd482d85ecf590c4 /src/network/access
parent45bf920947a7be2af047bd0f09a76a3c2064c3d7 (diff)
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/access')
-rw-r--r--src/network/access/qnetworkaccessftpbackend.cpp6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/network/access/qnetworkaccessftpbackend.cpp b/src/network/access/qnetworkaccessftpbackend.cpp
index 98967e730e..42201aa9a3 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()