diff options
author | Milian Wolff <mail@milianw.de> | 2014-02-06 17:42:05 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-06 20:17:23 +0100 |
commit | 862ac1547c19b02fc36bdc4b6ce5c6cf3442a868 (patch) | |
tree | d093564569da17fe3276089a314cc01bff142a8c /src/websockets/qwebsocketserver_p.h | |
parent | 47cbfe2aca62fa524da171ef147d959afee993ec (diff) | |
download | qtwebsockets-862ac1547c19b02fc36bdc4b6ce5c6cf3442a868.tar.gz |
Do not try to invoke/emit signal on shutdown.
I'm actually not sure whether this is the right way to do this,
but when the object is destroyed, we cannot delay the signal emit.
In that case, we just don't emit it at all. This is the old behavior
minus the warning:
QWARN : tst_QWebSocketServer::tst_initialisation()
QMetaObject::invokeMethod: No such method QObject::closed()
Change-Id: I0513dd693ef7bfc43621e24361e72e90204fbea3
Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
Diffstat (limited to 'src/websockets/qwebsocketserver_p.h')
-rw-r--r-- | src/websockets/qwebsocketserver_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/websockets/qwebsocketserver_p.h b/src/websockets/qwebsocketserver_p.h index c4afd3d..e932607 100644 --- a/src/websockets/qwebsocketserver_p.h +++ b/src/websockets/qwebsocketserver_p.h @@ -86,7 +86,7 @@ public: virtual ~QWebSocketServerPrivate(); void init(); - void close(); + void close(bool aboutToDestroy = false); QString errorString() const; bool hasPendingConnections() const; bool isListening() const; |