From: Eric Pouech epouech@codeweavers.com
Signed-off-by: Eric Pouech epouech@codeweavers.com --- programs/cmd/batch.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/programs/cmd/batch.c b/programs/cmd/batch.c index 42cb4c47b99..38a1e8c2826 100644 --- a/programs/cmd/batch.c +++ b/programs/cmd/batch.c @@ -676,7 +676,7 @@ RETURN_CODE WCMD_call(WCHAR *command) return_code = errorlevel; } } - else if (context) + else if (WCMD_is_in_context(NULL)) { WCHAR gotoLabel[MAX_PATH];
@@ -699,11 +699,13 @@ RETURN_CODE WCMD_call(WCHAR *command)
/* Restore the for loop context */ WCMD_restore_for_loop_context(); - } else { - WCMD_output_asis_stderr(WCMD_LoadMessage(WCMD_CALLINSCRIPT)); - return_code = ERROR_INVALID_FUNCTION; - } - return return_code; + } + else + { + WCMD_output_asis_stderr(WCMD_LoadMessage(WCMD_CALLINSCRIPT)); + return_code = ERROR_INVALID_FUNCTION; + } + return return_code; }
void WCMD_set_label_end(WCHAR *string)