1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QFtp: Suppress warning about reading from closed QIODevice.

Browse Source 
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>
This commit is contained in:
Friedemann Kleint 2015-05-19 15:25:14 +02:00
parent 06de0da1e8
commit 0c85cdb8c2
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/network/access/qftp.cpp
View File

@ -736,7 +736,10 @@ void QFtpDTP::socketConnectionClosed()
clearData(); clearData();
} }
bytesFromSocket = socket->readAll(); if (socket->isOpen())
bytesFromSocket = socket->readAll();
else
bytesFromSocket.clear();
#if defined(QFTPDTP_DEBUG) #if defined(QFTPDTP_DEBUG)
qDebug("QFtpDTP::connectState(CsClosed)"); qDebug("QFtpDTP::connectState(CsClosed)");
#endif #endif