From 1059208429915ef188f55fc03b3f041335f231b8 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 29 Mar 2007 17:28:21 +0000 Subject: [PATCH] fixed bug in wxThread::Wait() in console applications introduced in 2.8.3 (bug 1690777) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@45114 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- docs/changes.txt | 1 + src/msw/thread.cpp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/changes.txt b/docs/changes.txt index 0c29dc94c2..7b8182627a 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -98,6 +98,7 @@ wxMSW: - Don't lose combobox text when it's opened and closed (Kolya Kosenko) - Corrected GetChecked() for events from checkable menu items (smanders) - Fixed popup menus under Windows NT 4 +- Fixed bug in wxThread::Wait() in console applications introduced in 2.8.3 wxGTK: diff --git a/src/msw/thread.cpp b/src/msw/thread.cpp index a8826baed7..23462b2f02 100644 --- a/src/msw/thread.cpp +++ b/src/msw/thread.cpp @@ -771,7 +771,7 @@ wxThreadInternal::WaitForTerminate(wxCriticalSection& cs, // 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); + result = ::WaitForSingleObject(m_hThread, INFINITE); } else // wait for thread termination without blocking the GUI {