diff options
| author | Thorvald Natvig <slicer@users.sourceforge.net> | 2010-01-08 01:19:23 +0300 |
|---|---|---|
| committer | Thorvald Natvig <slicer@users.sourceforge.net> | 2010-01-08 01:19:23 +0300 |
| commit | 2e36c68f1eb75c5324f2056e210c33782ad3b995 (patch) | |
| tree | a6f6339c39bc7b6db6e428a109c58f67bed2064d | |
| parent | 62b97b587c250ec74f26d2533b6fd1adc32463b0 (diff) | |
Process disconnect events before connecting to new server
| -rw-r--r-- | src/mumble/MainWindow.cpp | 2 | ||||
| -rw-r--r-- | src/mumble/ServerHandler.cpp | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/src/mumble/MainWindow.cpp b/src/mumble/MainWindow.cpp index 78c10320f..9ddb63533 100644 --- 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 index 964ebd8df..dfa4fbed9 100644 --- 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) { |