Skip to content
Permalink
Browse files

Merge PR #3154: ServerHandler: ensure only a single connection timeou…

…t timer is active at one time.
  • Loading branch information...
davidebeatrici committed Jul 8, 2017
2 parents c93b087 + ffc8bf1 commit 6cd17bdc9385193cdb86f6dfe11752feb2d7bc49
Showing with 2 additions and 0 deletions.
  1. +2 −0 src/mumble/ServerHandler.cpp
@@ -302,6 +302,7 @@ void ServerHandler::run() {
do {
saTargetServer = qlAddresses.takeFirst();

tConnectionTimeoutTimer = NULL;
qbaDigest = QByteArray();
bStrong = true;
qtsSock = new QSslSocket(this);
@@ -393,6 +394,7 @@ void ServerHandler::run() {
msleep(100);
}
delete qtsSock;
delete tConnectionTimeoutTimer;
} while (shouldTryNextTargetServer && !qlAddresses.isEmpty());
}

0 comments on commit 6cd17bd

Please sign in to comment.
You can’t perform that action at this time.