Fix bug reported as PR 11854.

git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@63822 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 10 insertions, 3 deletions

diff --git a/misc/win32/start.c b/misc/win32/start.c
index cd83860dd..64a0b0dee 100644
--- a/misc/win32/start.c
+++ b/misc/win32/start.c
@@ -133,6 +133,12 @@ APR_DECLARE(apr_status_t) apr_app_initialize(int *argc,
                                              const char * const * *argv, 
                                              const char * const * *env)
 {
+    apr_status_t rv = apr_initialize();
+
+    if (rv != APR_SUCCESS) {
+        return rv;
+    }
+
 #if APR_HAS_UNICODE_FS
     IF_WIN_OS_IS_UNICODE
     {
@@ -142,9 +148,11 @@ APR_DECLARE(apr_status_t) apr_app_initialize(int *argc,
         int dupenv;
 
         if (apr_app_init_complete) {
-            return apr_initialize();
+            return rv;
         }
 
+        apr_app_init_complete = 1;
+
         sysstr = GetCommandLineW();
         if (sysstr) {
             wstrs = CommandLineToArgvW(sysstr, &wstrc);
@@ -178,10 +186,9 @@ APR_DECLARE(apr_status_t) apr_app_initialize(int *argc,
             free(wenv);
         }
 
-        apr_app_init_complete = 1;
     }
 #endif
-    return apr_initialize();
+    return rv;
 }
 
 static int initialized = 0;