diff options
| author | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2015-05-19 15:25:14 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2015-05-23 08:59:27 +0000 |
| commit | 0c85cdb8c2601981ce313f262f7d6db951bf61ac (patch) | |
| tree | 590894686b1f4239dd132225d3f67e18fb382353 /src/network/access/qftp.cpp | |
| parent | 06de0da1e8429f8174cfa78b644a09c0c23c478d (diff) | |
QFtp: Suppress warning about reading from closed QIODevice.
Clear bytesFromSocket when the socket is not open instead of
reading in QFtpDTP::socketConnectionClosed(), which is connected
to QTcpSocket::disconnected().
Task-number: QTBUG-46112
Change-Id: I0e5e47448f88601eb5c62fe9ba92e1a461323364
Reviewed-by: Timur Pocheptsov <Timur.Pocheptsov@digia.com>
Diffstat (limited to 'src/network/access/qftp.cpp')
| -rw-r--r-- | src/network/access/qftp.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/network/access/qftp.cpp b/src/network/access/qftp.cpp index bb89eece4b..a83d56f31f 100644 --- a/src/network/access/qftp.cpp +++ b/src/network/access/qftp.cpp @@ -736,7 +736,10 @@ void QFtpDTP::socketConnectionClosed() clearData(); } - bytesFromSocket = socket->readAll(); + if (socket->isOpen()) + bytesFromSocket = socket->readAll(); + else + bytesFromSocket.clear(); #if defined(QFTPDTP_DEBUG) qDebug("QFtpDTP::connectState(CsClosed)"); #endif |