diff options
| author | Rickard Green <[email protected]> | 2018-08-21 12:09:25 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2018-08-21 12:09:25 +0200 |
| commit | cc40705b86d1ca25286f8c0f522c8c7bbbeca6cd (patch) | |
| tree | 98d0121ab06be1f35358a35c1aea17671d0dd538 /erts/emulator/beam | |
| parent | be45eaca8f1260f392974db882e21f3591e8923f (diff) | |
| parent | 374bb679dafbd0739153ab1f5ed474c628788604 (diff) | |
| download | otp-cc40705b86d1ca25286f8c0f522c8c7bbbeca6cd.tar.gz otp-cc40705b86d1ca25286f8c0f522c8c7bbbeca6cd.tar.bz2 otp-cc40705b86d1ca25286f8c0f522c8c7bbbeca6cd.zip | |
Merge branch 'maint'
* maint:
Fix incoming suspend monitor down
Diffstat (limited to 'erts/emulator/beam')
| -rw-r--r-- | erts/emulator/beam/erl_proc_sig_queue.c | 2 |
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"); |