Prevent OverlayClient destructor from hanging on disconnect

Limit the maximum time a clean disconnect may take to 1s. Previously our GUI thread could become semi-permanently blocked.
mumble-voip · Apr 30, 2015 · ad1ed22 · ad1ed22
1 parent 9a2c0ee
commit ad1ed22
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/mumble/OverlayClient.cpp b/src/mumble/OverlayClient.cpp
@@ -99,8 +99,12 @@ OverlayClient::~OverlayClient() {
 	delete qgpiCursor;
 	delete qgpiLogo;
 
-	qlsSocket->disconnect();
-	qlsSocket->abort();
+	qlsSocket->disconnectFromServer();
+	if (!qlsSocket->waitForDisconnected(1000)) {
+		qDebug() << "OverlayClient: Failed to cleanly disconnect: " << qlsSocket->errorString();
+		qlsSocket->abort();
+	}
+
 	qlsSocket->deleteLater();
 
 	ougUsers.reset();