diff options
| author | Benjamin Jemlich <pcgod@users.sourceforge.net> | 2010-07-18 00:28:41 +0400 |
|---|---|---|
| committer | Benjamin Jemlich <pcgod@users.sourceforge.net> | 2010-07-18 00:28:41 +0400 |
| commit | bfa01db10c7b31fc5ab46f141a138ecbefcaa600 (patch) | |
| tree | b3a5131dafeb3581b4ad8ec97f0b23d1f39a3928 /src | |
| parent | 63b84d3f9a3717b8b40cf4c211fa425d0974b388 (diff) | |
Fix reconnecting when using Qt 4.7
Diffstat (limited to 'src')
| -rw-r--r-- | src/mumble/MainWindow.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/mumble/MainWindow.cpp b/src/mumble/MainWindow.cpp index 19eec8f4a..c7c1e4268 100644 --- a/src/mumble/MainWindow.cpp +++ b/src/mumble/MainWindow.cpp @@ -791,6 +791,14 @@ void MainWindow::on_qaServerConnect_triggered(bool autoconnect) { QCoreApplication::instance()->processEvents(); } + if (g.sh && g.sh->isFinished()) { + delete g.sh; + g.sh = new ServerHandler(); + g.sh->moveToThread(g.sh); + connect(g.sh, SIGNAL(connected()), this, SLOT(serverConnected())); + connect(g.sh, SIGNAL(disconnected(QAbstractSocket::SocketError, QString)), this, SLOT(serverDisconnected(QAbstractSocket::SocketError, QString))); + } + if (res == QDialog::Accepted) { qsDesiredChannel = QString(); rtLast = MumbleProto::Reject_RejectType_None; |