Process disconnect events before connecting to new server

mumble-voip · Jan 7, 2010 · 2e36c68 · 2e36c68
1 parent 62b97b5
commit 2e36c68
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/src/mumble/MainWindow.cpp b/src/mumble/MainWindow.cpp
@@ -575,6 +575,7 @@ void MainWindow::openUrl(const QUrl &url) {
 	if (g.sh && g.sh->isRunning()) {
 		on_qaServerDisconnect_triggered();
 		g.sh->wait();
+		QCoreApplication::instance()->processEvents();
 	}
 
 	rtLast = MumbleProto::Reject_RejectType_None;
@@ -726,6 +727,7 @@ void MainWindow::on_qaServerConnect_triggered() {
 	if (g.sh && g.sh->isRunning() && res == QDialog::Accepted) {
 		on_qaServerDisconnect_triggered();
 		g.sh->wait();
+		QCoreApplication::instance()->processEvents();
 	}
 
 	if (res == QDialog::Accepted) {

diff --git a/src/mumble/ServerHandler.cpp b/src/mumble/ServerHandler.cpp
@@ -314,6 +314,7 @@ void ServerHandler::run() {
 	while (! cptr.unique()) {
 		msleep(100);
 	}
+	delete qtsSock;
 }
 
 void ServerHandler::setSslErrors(const QList<QSslError> &errors) {