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

fix for hanging in wxThread::Delete() (patch 882198)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@25551 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2004-02-07 13:47:56 +00:00
parent 2194b1ec8f
commit dc1fc1bf65
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docs/changes.txt
View File

@@ -206,9 +206,9 @@ wxMSW:
- strip ampersands from strings returned by wxMenuBar::GetLabelTop() - strip ampersands from strings returned by wxMenuBar::GetLabelTop()
- fixed bug in wxIniConfig::DeleteEntry() (Parinya Thipchart) - fixed bug in wxIniConfig::DeleteEntry() (Parinya Thipchart)
- fixed hang (sometimes) in wxThread::Delete() (Carl-Friedrich Braun)
- wxLongLong formatting with MinGW corrected - wxLongLong formatting with MinGW corrected
- wxFileDialog now returns correct filter index for multiple-file - wxFileDialog now returns correct filter index for multiple-file dialogs
dialogs
wxGTK: wxGTK:

6
src/msw/thread.cpp
View File

@@ -887,8 +887,10 @@ wxThreadError wxThread::Delete(ExitCode *pRc)
break; break;
case WAIT_OBJECT_0 + 1: case WAIT_OBJECT_0 + 1:
// new message arrived, process it // new message arrived (or maybe not... sometimes the queue
if ( !wxTheApp->DoMessage() ) // is empty, hence call Pending() to be sure and not hang
// forever in DoMessage(), process it
if ( wxTheApp->Pending() && !wxTheApp->DoMessage() )
{ {
// WM_QUIT received: kill the thread // WM_QUIT received: kill the thread
Kill(); Kill();