Module: wine Branch: master Commit: 05bc632add5f6bc56de62632612eb10a1bff2725 URL: http://source.winehq.org/git/wine.git/?a=commit;h=05bc632add5f6bc56de6263261...
Author: Hugh McMaster hugh.mcmaster@outlook.com Date: Tue Dec 8 19:53:41 2015 +1100
cmd: Do not overwrite a user-specified Prompt variable.
Signed-off-by: Hugh McMaster hugh.mcmaster@outlook.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
programs/cmd/wcmdmain.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index ba7d9ca..bf988f5 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -2422,6 +2422,8 @@ int wmain (int argc, WCHAR *argvW[]) /* Until we start to read from the keyboard, stay as non-interactive */ interactive = FALSE;
+ SetEnvironmentVariableW(promptW, defaultpromptW); + if (opt_c || opt_k) { int len; WCHAR *q1 = NULL,*q2 = NULL,*p; @@ -2683,7 +2685,6 @@ int wmain (int argc, WCHAR *argvW[]) * Loop forever getting commands and executing them. */
- SetEnvironmentVariableW(promptW, defaultpromptW); interactive = TRUE; if (!opt_k) WCMD_version (); while (TRUE) {