aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/beam/erl_process.c
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2016-08-22 14:33:42 +0200
committerLukas Larsson <[email protected]>2016-08-22 14:33:42 +0200
commitd60bb68350ab96749d65e9b64e66ce83e8cd1cb3 (patch)
treea3e52ef8209a07e02fcc0c226bee1ecb36f16f42 /erts/emulator/beam/erl_process.c
parentbe3cd8376767967f1bc7079ca4fa0d1c136247a8 (diff)
parent2c1897c6ca6d4bfa4e30ebfd64dcfa807a596a51 (diff)
downloadotp-d60bb68350ab96749d65e9b64e66ce83e8cd1cb3.tar.gz
otp-d60bb68350ab96749d65e9b64e66ce83e8cd1cb3.tar.bz2
otp-d60bb68350ab96749d65e9b64e66ce83e8cd1cb3.zip
Merge branch 'maint'
Diffstat (limited to 'erts/emulator/beam/erl_process.c')
-rw-r--r--erts/emulator/beam/erl_process.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/erts/emulator/beam/erl_process.c b/erts/emulator/beam/erl_process.c
index 85c37e08be..3b246f5def 100644
--- a/erts/emulator/beam/erl_process.c
+++ b/erts/emulator/beam/erl_process.c
@@ -12279,7 +12279,6 @@ static void doit_exit_monitor(ErtsMonitor *mon, void *vpcontext)
erts_port_demonitor(pcontext->p,
ERTS_PORT_DEMONITOR_ORIGIN_ON_DEATHBED,
prt, mon->ref, NULL);
- return; /* let erts_port_demonitor do the deletion */
} else { /* remote by pid */
ASSERT(is_external_pid(mon->pid));
dep = external_pid_dist_entry(mon->pid);