aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/beam
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2018-08-21 12:09:04 +0200
committerRickard Green <[email protected]>2018-08-21 12:09:04 +0200
commit374bb679dafbd0739153ab1f5ed474c628788604 (patch)
tree55e12b6e9fc2b333e9dd0dfb6793e0b2a4a30ac1 /erts/emulator/beam
parentf2fec6ae41ba9300404614e96b3833613ee1db0d (diff)
parent1d1a604d66806fb622d03a7c82f0316a5b15ba4b (diff)
downloadotp-374bb679dafbd0739153ab1f5ed474c628788604.tar.gz
otp-374bb679dafbd0739153ab1f5ed474c628788604.tar.bz2
otp-374bb679dafbd0739153ab1f5ed474c628788604.zip
Merge branch 'rickard/fix-suspend-monitor-down/OTP-15237/ERL-704' into maint
* 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 f90501cbf7..f343e984f7 100644
--- a/erts/emulator/beam/erl_proc_sig_queue.c
+++ b/erts/emulator/beam/erl_proc_sig_queue.c
@@ -3126,8 +3126,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");