Permalink
Browse files

Revert 1e4e1e1.

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.
  • Loading branch information...
mkrautz committed Jan 29, 2016
1 parent c613139 commit 6f3bacbded1b91c8eff6d13de436d9650aaf36e1
Showing with 2 additions and 6 deletions.
  1. +2 −6 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();

0 comments on commit 6f3bacb

Please sign in to comment.