diff options
Diffstat (limited to 'src/bluetooth/qbluetoothsocket.cpp')
| -rw-r--r-- | src/bluetooth/qbluetoothsocket.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/bluetooth/qbluetoothsocket.cpp b/src/bluetooth/qbluetoothsocket.cpp index c7aea0b7..6272ca1f 100644 --- a/src/bluetooth/qbluetoothsocket.cpp +++ b/src/bluetooth/qbluetoothsocket.cpp @@ -313,7 +313,7 @@ void QBluetoothSocket::connectToService(const QBluetoothServiceInfo &service, Op { Q_D(QBluetoothSocket); - if (state() != QBluetoothSocket::UnconnectedState) { + if (state() != QBluetoothSocket::UnconnectedState && state() != QBluetoothSocket::ServiceLookupState) { qCWarning(QT_BT) << "QBluetoothSocket::connectToService called on busy socket"; d->errorString = QBluetoothSocket::tr("Trying to connect while connection is in progress"); setSocketError(QBluetoothSocket::OperationError); @@ -686,6 +686,7 @@ bool QBluetoothSocket::setSocketDescriptor(int socketDescriptor, QBluetoothServi /*! Returns the platform-specific socket descriptor, if available. + This function returns -1 if the descriptor is not available or an error has occurred. */ int QBluetoothSocket::socketDescriptor() const |