diff options
| author | Jonas M. Gastal <jgastal@profusion.mobi> | 2011-12-27 18:00:18 -0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-04 18:46:52 +0100 |
| commit | b49467220811059ea85f1a31eeecb6797dc753e2 (patch) | |
| tree | 495ae79fd5746e2e8311ee2fbb2c99aa5dfad2ae /src/network/socket/qlocalsocket_win.cpp | |
| parent | f821d6352e384a737c82a0db903104ec4f8611bd (diff) | |
Emit error if trying to connect while socket is connected or connecting.
This applies to both local and abstract sockets.
Task-number: QTBUG-22450
Change-Id: I5c58d68da95ffb6bcde5be510853359b288e5984
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
Diffstat (limited to 'src/network/socket/qlocalsocket_win.cpp')
| -rw-r--r-- | src/network/socket/qlocalsocket_win.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/network/socket/qlocalsocket_win.cpp b/src/network/socket/qlocalsocket_win.cpp index e049f68c2f..8b18c13d65 100644 --- a/src/network/socket/qlocalsocket_win.cpp +++ b/src/network/socket/qlocalsocket_win.cpp @@ -131,8 +131,11 @@ void QLocalSocketPrivate::destroyPipeHandles() void QLocalSocket::connectToServer(const QString &name, OpenMode openMode) { Q_D(QLocalSocket); - if (state() == ConnectedState || state() == ConnectingState) + if (state() == ConnectedState || state() == ConnectingState) { + setErrorString("Trying to connect while connection is in progress"); + emit error(QLocalSocket::OperationError); return; + } d->error = QLocalSocket::UnknownSocketError; d->errorString = QString(); |