diff options
author | Benjamin Jemlich <pcgod@users.sourceforge.net> | 2010-07-30 11:47:10 +0400 |
---|---|---|
committer | Benjamin Jemlich <pcgod@users.sourceforge.net> | 2010-07-30 11:47:10 +0400 |
commit | a2e2a82727067a7a330c6837c62e94cd7164e465 (patch) | |
tree | 81315a4caced0facc369f5919c19833fe60110b5 /src | |
parent | 1a2ea89896f02559a359f0b9f88145380eb15107 (diff) |
Fix crash when connecting to a different server
Diffstat (limited to 'src')
-rw-r--r-- | src/mumble/MainWindow.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mumble/MainWindow.cpp b/src/mumble/MainWindow.cpp index 82b2225a4..fb4e662f9 100644 --- a/src/mumble/MainWindow.cpp +++ b/src/mumble/MainWindow.cpp @@ -518,7 +518,6 @@ void MainWindow::on_qteLog_customContextMenuRequested(const QPoint &mpos) { static void recreateServerHandler() { ServerHandler *sh = g.sh; - g.sh = NULL; if (sh && sh->isRunning()) { g.mw->on_qaServerDisconnect_triggered(); sh->disconnect(); @@ -526,6 +525,7 @@ static void recreateServerHandler() { QCoreApplication::instance()->processEvents(); } + g.sh = NULL; delete sh; sh = new ServerHandler(); sh->moveToThread(sh); |