wxFTP::Close() shouldn't hide base wxSocket function

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6863 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-03-19 18:46:55 +00:00
parent bae411099c
commit 7ff26ec2ae
2 changed files with 10 additions and 10 deletions
--- a/src/common/ftp.cpp
+++ b/src/common/ftp.cpp
@@ -71,6 +71,11 @@ wxFTP::wxFTP()

 wxFTP::~wxFTP()
 {
+    if ( m_streaming )
+    {
+        (void)Abort();
+    }
+
    Close();
 }

@@ -122,17 +127,12 @@ bool wxFTP::Connect(const wxString& host)
  return Connect(addr);
 }

-bool wxFTP::Close(bool force)
+bool wxFTP::Close()
 {
    if ( m_streaming )
    {
-        if ( !force )
-        {
-            m_lastError = wxPROTO_STREAMING;
-            return FALSE;
-        }
-
-        (void)Abort();
+        m_lastError = wxPROTO_STREAMING;
+        return FALSE;
    }

    if ( IsConnected() )