From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 6 Aug 2005 21:35:12 +0000 (+0000)
Subject: set m_error correctly (patch 1249848)
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/3a0827804bad3f202cfcfcd92c439363741f1044

set m_error correctly (patch 1249848)


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

diff --git a/src/common/sckfile.cpp b/src/common/sckfile.cpp
index 483f4eb7c8..db1cab98cc 100644
--- a/src/common/sckfile.cpp
+++ b/src/common/sckfile.cpp
@@ -33,8 +33,9 @@ IMPLEMENT_DYNAMIC_CLASS(wxFileProto, wxProtocol)
 IMPLEMENT_PROTOCOL(wxFileProto, wxT("file"), NULL, false)
 
 wxFileProto::wxFileProto()
-  : wxProtocol()
+           : wxProtocol()
 {
+    m_error = wxPROTO_NOERR;
 }
 
 wxFileProto::~wxFileProto()
@@ -43,13 +44,18 @@ wxFileProto::~wxFileProto()
 
 wxInputStream *wxFileProto::GetInputStream(const wxString& path)
 {
-  wxFileInputStream* retval = new wxFileInputStream(wxURI::Unescape(path));
-  if (retval->Ok()) {
-    return retval;
-  } else {
+    wxFileInputStream *retval = new wxFileInputStream(wxURI::Unescape(path));
+    if ( retval->Ok() )
+    {
+        m_error = wxPROTO_NOERR;
+
+        return retval;
+    }
+
+    m_error = wxPROTO_NOFILE;
     delete retval;
-    return 0;
-  }
+
+    return NULL;
 }
 
 #endif // wxUSE_STREAMS && wxUSE_PROTOCOL_FILE