Fix bug - window closed after exit from IBController with /INLINE

rlktradewright · Feb 12, 2018 · 2c0474a · 2c0474a
1 parent 5dea2da
commit 2c0474a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/resources/IBControllerGatewayStart.bat b/resources/IBControllerGatewayStart.bat
@@ -160,7 +160,10 @@ if /I "%HIDE%" == "YES" (
 )
 
 if /I "%~1" == "/INLINE" (
+	set INLINE=1
 	"%IBC_PATH%\Scripts\DisplayBannerAndLaunch.bat"
 ) else (
+	set INLINE=0
 	start "%TITLE%" %MIN% "%IBC_PATH%\Scripts\DisplayBannerAndLaunch.bat"
 )
+exit /B
diff --git a/resources/IBControllerStart.bat b/resources/IBControllerStart.bat
@@ -146,7 +146,10 @@ if /I "%HIDE%" == "YES" (
 )
 
 if /I "%~1" == "/INLINE" (
+	set INLINE=1
 	"%IBC_PATH%\Scripts\DisplayBannerAndLaunch.bat"
 ) else (
+	set INLINE=0
 	start "%TITLE%" %MIN% "%IBC_PATH%\Scripts\DisplayBannerAndLaunch.bat"
 )
+exit /B
diff --git a/resources/Scripts/DisplayBannerAndLaunch.bat b/resources/Scripts/DisplayBannerAndLaunch.bat
@@ -69,7 +69,7 @@ if defined LOG_PATH (
 
 echo +
 echo + ** Caution: closing this window will close %APP% %TWS_MAJOR_VRSN% **
-echo + (window will close automatically when you exit from %APP% %TWS_MAJOR_VRSN%)
+if "%INLINE%" == "0" echo + (window will close automatically when you exit from %APP% %TWS_MAJOR_VRSN%)
 echo +
 
 ::   now launch IBController
@@ -96,6 +96,7 @@ if defined LOG_PATH (
 )
 
 color
+if "%INLINE%" == "1" exit /B
 exit
 
 :err
@@ -133,4 +134,5 @@ echo +
 echo + Press any key to close this window
 pause > NUL
 echo +
+if "%INLINE%" == "1" exit /B
 exit