Fixes/makefiles for building data view control on Windows

[wxWidgets.git] / src / msw / dialup.cpp

diff --git a/src/msw/dialup.cpp b/src/msw/dialup.cpp
index b4bb8d55eabf03a048161ff7cee07248935db0cc..074b23c6a52d25336bb5505b5a31890a0fe67443 100644 (file)
--- a/src/msw/dialup.cpp
+++ b/src/msw/dialup.cpp
@@ -947,8 +947,10 @@ bool wxDialUpManagerMSW::HangUp()
         return false;
     }
 
         return false;
     }
 

-    DWORD dwRet = ms_pfnRasHangUp(hRasConn);
-    if ( dwRet != 0 )
+    // note that it's not an error if the connection had been already
+    // terminated
+    const DWORD dwRet = ms_pfnRasHangUp(hRasConn);
+    if ( dwRet != 0 && dwRet != ERROR_NO_CONNECTION )

     {
         wxLogError(_("Failed to terminate the dialup connection: %s"),
                    GetErrorString(dwRet).c_str());
     {
         wxLogError(_("Failed to terminate the dialup connection: %s"),
                    GetErrorString(dwRet).c_str());


@@ -1186,7 +1188,7 @@ void wxDialUpManagerMSW::DisableAutoCheckOnlineStatus()
 {
     wxCHECK_RET( IsOk(), wxT("using uninitialized wxDialUpManager") );
 
 {
     wxCHECK_RET( IsOk(), wxT("using uninitialized wxDialUpManager") );
 

-    if ( --m_autoCheckLevel )
+    if ( --m_autoCheckLevel != 0 )

     {
         // still checking
         return;
     {
         // still checking
         return;