From f00c584454b7a772f6b6fd0b41df3deebde3eb5d Mon Sep 17 00:00:00 2001 From: FellippeHeitor Date: Fri, 15 Apr 2016 10:01:58 -0300 Subject: [PATCH] Fix to extra console window being shown when no COMMAND$ is provided. A trailing empty space was the culprit. --- source/global/version.bas | 2 +- source/ide/ide_methods.bas | 4 +++- source/qb64.bas | 8 ++++---- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/source/global/version.bas b/source/global/version.bas index 0830a0af2..c66860b9d 100644 --- a/source/global/version.bas +++ b/source/global/version.bas @@ -3,5 +3,5 @@ DIM SHARED BuildNum AS STRING Version$ = "1.000" 'BuildNum format is YYYYMMDD/id, where id is a ever-increasing 'integer. If you make a change, update the date and increase the id! -BuildNum$ = "20160415/9" +BuildNum$ = "20160415/10" diff --git a/source/ide/ide_methods.bas b/source/ide/ide_methods.bas index faab23fcf..6a21c4d69 100644 --- a/source/ide/ide_methods.bas +++ b/source/ide/ide_methods.bas @@ -9151,6 +9151,7 @@ i = 0 idepar p, 65, 5, "Modify COMMAND$" a2$ = ModifyCOMMAND$ +if len(a2$) > 0 then a2$ = MID$(a2$, 2) i = i + 1 o(i).typ = 1 o(i).y = 2 @@ -9246,7 +9247,8 @@ DO 'main loop IF K$ = CHR$(27) OR (focus = 3 AND info <> 0) THEN EXIT FUNCTION IF K$ = CHR$(13) OR (focus = 2 AND info <> 0) THEN - ModifyCOMMAND$ = idetxt(o(1).txt) + ModifyCOMMAND$ = " " + idetxt(o(1).txt) + IF LTRIM$(RTRIM$(ModifyCOMMAND$)) = "" THEN ModifyCOMMAND$ = "" EXIT FUNCTION END IF diff --git a/source/qb64.bas b/source/qb64.bas index 13b5d10fc..54d19bfba 100644 --- a/source/qb64.bas +++ b/source/qb64.bas @@ -1104,11 +1104,11 @@ IF C = 9 THEN 'run 'execute program IF iderunmode = 1 THEN - IF os$ = "WIN" THEN SHELL _DONTWAIT QuotedFilename$(CHR$(34) + file$ + extension$ + CHR$(34)) + " " + ModifyCOMMAND$ - IF os$ = "LNX" THEN SHELL _DONTWAIT QuotedFilename$("./" + file$ + extension$) + " " + ModifyCOMMAND$ + IF os$ = "WIN" THEN SHELL _DONTWAIT QuotedFilename$(CHR$(34) + file$ + extension$ + CHR$(34)) + ModifyCOMMAND$ + IF os$ = "LNX" THEN SHELL _DONTWAIT QuotedFilename$("./" + file$ + extension$) + ModifyCOMMAND$ ELSE - IF os$ = "WIN" THEN SHELL QuotedFilename$(CHR$(34) + file$ + extension$ + CHR$(34)) + " " + ModifyCOMMAND$ - IF os$ = "LNX" THEN SHELL QuotedFilename$("./" + file$ + extension$) + " " + ModifyCOMMAND$ + IF os$ = "WIN" THEN SHELL QuotedFilename$(CHR$(34) + file$ + extension$ + CHR$(34)) + ModifyCOMMAND$ + IF os$ = "LNX" THEN SHELL QuotedFilename$("./" + file$ + extension$) + ModifyCOMMAND$ END IF sendc$ = CHR$(6) 'ready