commit eac3662bc7965acea38550a88b3e8dc54e471700
author Alexandre Julliard <julliard@winehq.org> Sun Apr 14 19:36:02 2002 +0000
committer Alexandre Julliard <julliard@winehq.org> Sun Apr 14 19:36:02 2002 +0000
tree 3353c1794cd2854100bb1fac0700c95ae0ee859c
parent 08867f7149f82446f8df9e3ebfa85563db5adbf2

Fixed inheriting command-line options from parent process.

misc/options.c

diff --git a/misc/options.c b/misc/options.c
index 9d5cec8..8f596ad 100644
--- a/misc/options.c
+++ b/misc/options.c
@@ -330,6 +330,7 @@
 
     if (GetEnvironmentVariableA( "WINEOPTIONS", buffer, sizeof(buffer) ) && buffer[0])
         inherit_options( buffer );
+    if (!argv) return;
 
     parse_options( argv + 1 );
 

scheduler/process.c

diff --git a/scheduler/process.c b/scheduler/process.c
index 11e95e4..1ea70b2 100644
--- a/scheduler/process.c
+++ b/scheduler/process.c
@@ -316,7 +316,7 @@
         return FALSE;
 
     /* Parse command line arguments */
-    if (!info) OPTIONS_ParseOptions( argv );
+    OPTIONS_ParseOptions( info ? argv : NULL );
     app_argc = 0;
     while (argv[app_argc]) app_argc++;