From 6f3bacbded1b91c8eff6d13de436d9650aaf36e1 Mon Sep 17 00:00:00 2001
From: Mikkel Krautz <mikkel@krautz.dk>
Date: Fri, 29 Jan 2016 21:25:24 +0100
Subject: 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.
---
 src/mumble/OverlayClient.cpp | 8 ++------
 1 file 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();
-- 
cgit v1.2.3