don't log error if connection has been already terminated in HangUp() (patch 1243184)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34957 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/msw/dialup.cpp b/src/msw/dialup.cpp
index b4bb8d55eabf03a048161ff7cee07248935db0cc..0114b7759e8e41da798a1c1a00a7b119c5424667 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());