aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2017-01-11 16:13:57 +0100
committerRickard Green <[email protected]>2017-01-11 16:13:57 +0100
commitf704fcf7a4524ad8dba04484224e486999db0a3d (patch)
treeac980b6cc6dd1cbddfe0b0dff776da5c1e582096 /erts/emulator
parent947e0e1176b5b985293e27164ee8e6912dee8133 (diff)
parent064a2630129caadbca58aaebe83f78735c1e374d (diff)
downloadotp-f704fcf7a4524ad8dba04484224e486999db0a3d.tar.gz
otp-f704fcf7a4524ad8dba04484224e486999db0a3d.tar.bz2
otp-f704fcf7a4524ad8dba04484224e486999db0a3d.zip
Merge branch 'rickard/crashdump-timer-fix' into maint
OTP-14133 * rickard/crashdump-timer-fix: Fix printout of timer data in crash dump
Diffstat (limited to 'erts/emulator')
-rw-r--r--erts/emulator/beam/erl_hl_timer.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/erts/emulator/beam/erl_hl_timer.c b/erts/emulator/beam/erl_hl_timer.c
index 38bebc7576..647fa26811 100644
--- a/erts/emulator/beam/erl_hl_timer.c
+++ b/erts/emulator/beam/erl_hl_timer.c
@@ -2865,7 +2865,8 @@ btm_print(ErtsHLTimer *tmr, void *vbtmp)
if (tmr->timeout <= btmp->now)
left = 0;
- left = ERTS_CLKTCKS_TO_MSEC(tmr->timeout - btmp->now);
+ else
+ left = ERTS_CLKTCKS_TO_MSEC(tmr->timeout - btmp->now);
receiver = ((tmr->head.roflgs & ERTS_TMR_ROFLG_REG_NAME)
? tmr->receiver.name