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

added auto check count as otherwise calling EnableAutoCheck() twice in a row resulted in problems

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25712 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2004-02-10 18:21:36 +00:00
parent 21f9e95380
commit 6bba111cc6
1 changed files with 23 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/msw/dialup.cpp
View File

@@ -204,6 +204,10 @@ private:
// destroy the thread data and the thread itself // destroy the thread data and the thread itself
void CleanUpThreadData(); void CleanUpThreadData();
// number of times EnableAutoCheckOnlineStatus() had been called minus the
// number of times DisableAutoCheckOnlineStatus() had been called
int m_autoCheckLevel;
// timer used for polling RAS status // timer used for polling RAS status
class WXDLLEXPORT RasTimer : public wxTimer class WXDLLEXPORT RasTimer : public wxTimer
{ {
@@ -339,6 +343,7 @@ wxDialUpManagerMSW::wxDialUpManagerMSW()
m_dllRas(_T("RASAPI32")) m_dllRas(_T("RASAPI32"))
{ {
// initialize our data // initialize our data
m_autoCheckLevel = 0;
m_hThread = 0; m_hThread = 0;
if ( !m_dllRas.IsLoaded() ) if ( !m_dllRas.IsLoaded() )
@@ -990,6 +995,12 @@ bool wxDialUpManagerMSW::EnableAutoCheckOnlineStatus(size_t nSeconds)
{ {
wxCHECK_MSG( IsOk(), FALSE, wxT("using uninitialized wxDialUpManager") ); wxCHECK_MSG( IsOk(), FALSE, wxT("using uninitialized wxDialUpManager") );
if ( m_autoCheckLevel++ )
{
// already checking
return TRUE;
}
bool ok = ms_pfnRasConnectionNotification != 0; bool ok = ms_pfnRasConnectionNotification != 0;
if ( ok ) if ( ok )
@@ -1000,22 +1011,13 @@ bool wxDialUpManagerMSW::EnableAutoCheckOnlineStatus(size_t nSeconds)
// first, see if we don't have this thread already running // first, see if we don't have this thread already running
if ( m_hThread != 0 ) if ( m_hThread != 0 )
{ {
DWORD dwSuspendCount = 2; if ( ::ResumeThread(m_hThread) != (DWORD)-1 )
while ( dwSuspendCount > 1 )
{
dwSuspendCount = ResumeThread(m_hThread);
if ( dwSuspendCount == (DWORD)-1 )
{
wxLogLastError(wxT("ResumeThread(RasThread)"));
ok = FALSE;
}
}
if ( ok )
{
return TRUE; return TRUE;
}
// we're leaving a zombie thread... but what else can we do?
wxLogLastError(wxT("ResumeThread(RasThread)"));
ok = FALSE;
} }
} }
@@ -1142,6 +1144,12 @@ void wxDialUpManagerMSW::DisableAutoCheckOnlineStatus()
{ {
wxCHECK_RET( IsOk(), wxT("using uninitialized wxDialUpManager") ); wxCHECK_RET( IsOk(), wxT("using uninitialized wxDialUpManager") );
if ( --m_autoCheckLevel )
{
// still checking
return;
}
if ( m_hThread ) if ( m_hThread )
{ {
// we have running secondary thread, it's just enough to suspend it // we have running secondary thread, it's just enough to suspend it