fix for wxGetEnv() under Win16 (!) (bug 645368)

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

diff --git a/src/msw/utils.cpp b/src/msw/utils.cpp
index 4556f6fa971b1c6d060ad89a670760887dc750f4..66414baaa242ce4d4ce150992fd8db08016a0409 100644 (file)
--- a/src/msw/utils.cpp
+++ b/src/msw/utils.cpp
@@ -600,14 +600,16 @@ bool wxGetEnv(const wxString& var, wxString *value)
 {
 #ifdef __WIN16__
     const wxChar* ret = wxGetenv(var);
 {
 #ifdef __WIN16__
     const wxChar* ret = wxGetenv(var);

-    if (ret)
+    if ( !ret )
+        return FALSE;
+
+    if ( value )

     {
         *value = ret;
     {
         *value = ret;

-        return TRUE;

     }
     }

-    else
-        return FALSE;
-#else
+
+    return TRUE;
+#else // Win32

     // first get the size of the buffer
     DWORD dwRet = ::GetEnvironmentVariable(var, NULL, 0);
     if ( !dwRet )
     // first get the size of the buffer
     DWORD dwRet = ::GetEnvironmentVariable(var, NULL, 0);
     if ( !dwRet )


@@ -623,7 +625,7 @@ bool wxGetEnv(const wxString& var, wxString *value)
     }
 
     return TRUE;
     }
 
     return TRUE;

-#endif
+#endif // Win16/32

 }
 
 bool wxSetEnv(const wxString& var, const wxChar *value)
 }
 
 bool wxSetEnv(const wxString& var, const wxChar *value)