aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/beam
diff options
context:
space:
mode:
authorErlang/OTP <[email protected]>2018-08-29 13:32:04 +0200
committerErlang/OTP <[email protected]>2018-08-29 13:32:04 +0200
commit2a6b8f266737ab05baf9d3001c3926996510e9c6 (patch)
tree0669a32b6625dcca69976d822b304fefc2e15d6e /erts/emulator/beam
parent53b1e77ea7be8d90d652521a2326046b5d95c3e2 (diff)
parent1d1a604d66806fb622d03a7c82f0316a5b15ba4b (diff)
downloadotp-2a6b8f266737ab05baf9d3001c3926996510e9c6.tar.gz
otp-2a6b8f266737ab05baf9d3001c3926996510e9c6.tar.bz2
otp-2a6b8f266737ab05baf9d3001c3926996510e9c6.zip
Merge branch 'rickard/fix-suspend-monitor-down/OTP-15237/ERL-704' into maint-21
* rickard/fix-suspend-monitor-down/OTP-15237/ERL-704: Fix incoming suspend monitor down
Diffstat (limited to 'erts/emulator/beam')
-rw-r--r--erts/emulator/beam/erl_proc_sig_queue.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/beam/erl_proc_sig_queue.c b/erts/emulator/beam/erl_proc_sig_queue.c
index d6d22677e7..6af1236145 100644
--- a/erts/emulator/beam/erl_proc_sig_queue.c
+++ b/erts/emulator/beam/erl_proc_sig_queue.c
@@ -3146,8 +3146,8 @@ erts_proc_sig_handle_incoming(Process *c_p, erts_aint32_t *statep,
erts_monitor_tree_delete(&ERTS_P_MONITORS(c_p),
&mdp->origin);
omon = &mdp->origin;
+ remove_nm_sig(c_p, sig, next_nm_sig);
}
- remove_nm_sig(c_p, sig, next_nm_sig);
break;
default:
ERTS_INTERNAL_ERROR("invalid monitor type");