summaryrefslogtreecommitdiffstats
path: root/src/bluetooth/qbluetoothserver_qnx.cpp
diff options
context:
space:
mode:
authorNedim Hadzic <nhadzic@blackberry.com>2014-02-21 14:09:59 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-02-26 16:19:49 +0100
commit98431098856cab7d386fa2921eef837ce5e6e03f (patch)
tree82520e5895479b0b85e2951fa1dd54102befcdba /src/bluetooth/qbluetoothserver_qnx.cpp
parent3ea69e89d43911f68203fcb40fee80a6bcd04ed5 (diff)
QNX Service registered value fix
Once registerService() was called isRegistered() will always return true. A call to unregisterService() now resets the value. Cleaning fake server port hash. Task-number: QTBUG-36626 Change-Id: I452651266192e5773b8330e5f7c02885adff2279 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
Diffstat (limited to 'src/bluetooth/qbluetoothserver_qnx.cpp')
-rw-r--r--src/bluetooth/qbluetoothserver_qnx.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/bluetooth/qbluetoothserver_qnx.cpp b/src/bluetooth/qbluetoothserver_qnx.cpp
index 445c57b1..5dfacfb2 100644
--- a/src/bluetooth/qbluetoothserver_qnx.cpp
+++ b/src/bluetooth/qbluetoothserver_qnx.cpp
@@ -144,7 +144,10 @@ void QBluetoothServer::close()
d->socket->close();
delete d->socket;
d->socket = 0;
- ppsSendControlMessage("deregister_server", 0x1101, d->m_uuid, QString(), QString(), 0);
+ if (__fakeServerPorts.contains(d)) {
+ ppsSendControlMessage("deregister_server", 0x1101, d->m_uuid, QString(), QString(), 0);
+ __fakeServerPorts.remove(d);
+ }
// force active object (socket) to run and shutdown socket.
qApp->processEvents(QEventLoop::ExcludeUserInputEvents);
}