Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

don't wait for Windows messages in WaitForThread() if we don't dispatch events (should fix the bugs 1523302 and 1650795)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@44346 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-02-02 23:22:22 +00:00
parent 8aaba8af80
commit f30083b960
1 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/msw/thread.cpp
View File

@@ -755,15 +755,26 @@ wxThreadInternal::WaitForTerminate(wxCriticalSection& cs,
#if !defined(QS_ALLPOSTMESSAGE)
#define QS_ALLPOSTMESSAGE 0
#endif
result = ::MsgWaitForMultipleObjects
(
1, // number of objects to wait for
&m_hThread, // the objects
false, // don't wait for all objects
INFINITE, // no timeout
QS_ALLINPUT|QS_ALLPOSTMESSAGE // return as soon as there are any events
);
if ( !wxEventLoop::GetActive() )
{
// don't ask for Windows messages if we don't have a running event
// loop to process them as otherwise we'd enter an infinite loop
// with MsgWaitForMultipleObjects() always returning WAIT_OBJECT_0
// + 1 because the message would remain forever in the queue
result = ::WaitForSingleObject(&m_hThread, INFINITE);
}
else // wait for thread termination without blocking the GUI
{
result = ::MsgWaitForMultipleObjects
(
1, // number of objects to wait for
&m_hThread, // the objects
false, // don't wait for all objects
INFINITE, // no timeout
QS_ALLINPUT | // return as soon as there are any events
QS_ALLPOSTMESSAGE
);
}
switch ( result )
{