aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2017-03-28 10:35:21 +0200
committerLukas Larsson <[email protected]>2017-03-28 10:35:21 +0200
commit8e44a7ef60248eec658cfc81ad1110bc72a937c7 (patch)
tree22e2d5501fbe9997b7111e5dc8801ff7962a8db7
parent3eb01a8b3c02910495ccf69921f48c606b44361f (diff)
parent455132374162a06df39e1bff4780610ef8e86870 (diff)
downloadotp-8e44a7ef60248eec658cfc81ad1110bc72a937c7.tar.gz
otp-8e44a7ef60248eec658cfc81ad1110bc72a937c7.tar.bz2
otp-8e44a7ef60248eec658cfc81ad1110bc72a937c7.zip
Merge branch 'lukas/erts/hide-debug-consoles'
* lukas/erts/hide-debug-consoles: erts: Only show debug consoles if ERL_CONSOLE_MODE is defined
-rw-r--r--erts/etc/common/erlexec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/etc/common/erlexec.c b/erts/etc/common/erlexec.c
index 2b2e0e480a..ee59759940 100644
--- a/erts/etc/common/erlexec.c
+++ b/erts/etc/common/erlexec.c
@@ -1044,7 +1044,7 @@ int main(int argc, char **argv)
start_epmd(epmd_prog);
#if (! defined(__WIN32__)) && defined(DEBUG)
- if (start_detached) {
+ if (start_detached && get_env("ERL_CONSOLE_MODE")) {
/* Start the emulator within an xterm.
* Move up all arguments and insert
* "xterm -e " first.