aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2016-07-14 15:46:51 +0200
committerLukas Larsson <[email protected]>2016-07-14 15:46:51 +0200
commit407156221fc55f4fbacbff752a6bd28cdbb59249 (patch)
tree51a8d81821a730d8e64c56dec39922aa11a784a9 /erts/emulator
parentc5153e77b8a448d5ff1b0277d7813a44829d2dfd (diff)
parent4cec737d18f02a3cb3e59b95b86c0a50a0649693 (diff)
downloadotp-407156221fc55f4fbacbff752a6bd28cdbb59249.tar.gz
otp-407156221fc55f4fbacbff752a6bd28cdbb59249.tar.bz2
otp-407156221fc55f4fbacbff752a6bd28cdbb59249.zip
Merge branch 'maint'
Diffstat (limited to 'erts/emulator')
-rw-r--r--erts/emulator/beam/erl_trace.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/erts/emulator/beam/erl_trace.c b/erts/emulator/beam/erl_trace.c
index 4cf38bf894..d14d237ca6 100644
--- a/erts/emulator/beam/erl_trace.c
+++ b/erts/emulator/beam/erl_trace.c
@@ -493,8 +493,8 @@ erts_get_system_seq_tracer(void)
if (st != erts_tracer_nil &&
call_enabled_tracer(st, NULL, TRACE_FUN_ENABLED,
am_trace_status, am_undefined) == am_remove) {
- erts_set_system_seq_tracer(NULL, 0, erts_tracer_nil);
- st = erts_tracer_nil;
+ st = erts_set_system_seq_tracer(NULL, 0, erts_tracer_nil);
+ ERTS_TRACER_CLEAR(&st);
}
return st;