From 06fec274ddd3827bc2ebea5346e21cf09130227c Mon Sep 17 00:00:00 2001 From: Thorvald Natvig Date: Wed, 10 Mar 2010 18:24:20 +0100 Subject: [PATCH] Work around WSAAsyncSelect and WSAEventSelect overlapping on Win32 --- src/murmur/Server.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/murmur/Server.cpp b/src/murmur/Server.cpp index 308188bf2..c4bb08dfc 100644 --- a/src/murmur/Server.cpp +++ b/src/murmur/Server.cpp @@ -245,8 +245,6 @@ void Server::stopThread() { if (isRunning()) { log("Ending voice thread"); - foreach(QSocketNotifier *qsn, qlUdpNotifier) - qsn->setEnabled(true); #ifdef Q_OS_UNIX unsigned char val = 0; ::write(aiNotify[1], &val, 1); @@ -254,6 +252,9 @@ void Server::stopThread() { SetEvent(hNotify); #endif wait(); + + foreach(QSocketNotifier *qsn, qlUdpNotifier) + qsn->setEnabled(true); } qtTimeout->stop(); }