Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mumble-voip/mumble.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMikkel Krautz <mikkel@krautz.dk>2016-01-29 23:25:24 +0300
committerMikkel Krautz <mikkel@krautz.dk>2016-01-29 23:28:34 +0300
commit6f3bacbded1b91c8eff6d13de436d9650aaf36e1 (patch)
treecd614ad8a1645f5cdd3f8a59791aa2579d535afe
parentc6131394a5eaca2d77ef2dfa28873582709cc40c (diff)
Revert 1e4e1e12.
The fix is incorrect, and changes the behavior of the OverlayClient destructor to sometimes cause double deletes. This could cause crashes when users quit the Mumble client.
-rw-r--r--src/mumble/OverlayClient.cpp8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/mumble/OverlayClient.cpp b/src/mumble/OverlayClient.cpp
index 4a08fa7c3..c3c408dfa 100644
--- a/src/mumble/OverlayClient.cpp
+++ b/src/mumble/OverlayClient.cpp
@@ -90,12 +90,8 @@ OverlayClient::~OverlayClient() {
delete qgpiCursor;
delete qgpiLogo;
- qlsSocket->disconnectFromServer();
- if (!qlsSocket->waitForDisconnected(1000)) {
- qDebug() << "OverlayClient: Failed to cleanly disconnect: " << qlsSocket->errorString();
- qlsSocket->abort();
- }
-
+ qlsSocket->disconnect();
+ qlsSocket->abort();
qlsSocket->deleteLater();
ougUsers.reset();