From 88c37f00b352a8720190ad33efde29d5db165be3 Mon Sep 17 00:00:00 2001
From: Simon MacMullen <simon@rabbitmq.com>
Date: Wed, 16 Jan 2013 10:55:59 +0000
Subject: ...and do the same thing here.

---
 src/rabbit_event.erl | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/rabbit_event.erl b/src/rabbit_event.erl
index 7d91b6fa..2d626ad4 100644
--- a/src/rabbit_event.erl
+++ b/src/rabbit_event.erl
@@ -112,8 +112,10 @@ stop_stats_timer(C, P) ->
     case element(P, C) of
         #state{level = Level, timer = TRef} = State
           when Level =/= none andalso TRef =/= undefined ->
-            erlang:cancel_timer(TRef),
-            setelement(P, C, State#state{timer = undefined});
+            case erlang:cancel_timer(TRef) of
+                false -> C;
+                _     -> setelement(P, C, State#state{timer = undefined})
+            end;
         #state{} ->
             C
     end.
-- 
cgit v1.2.1