From 66a368348223c8a03a14cbc9f53396a5c407a7b2 Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Wed, 17 Sep 2014 16:48:46 -0700
Subject: [PATCH] Fix timer bug with script engine

	Occurs when Script.clearInterval() called inside
Script.setInterval callback
---
 libraries/script-engine/src/ScriptEngine.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/libraries/script-engine/src/ScriptEngine.cpp b/libraries/script-engine/src/ScriptEngine.cpp
index 0f285a0df3..29423b7116 100644
--- a/libraries/script-engine/src/ScriptEngine.cpp
+++ b/libraries/script-engine/src/ScriptEngine.cpp
@@ -614,6 +614,7 @@ void ScriptEngine::timerFired() {
 
     if (!callingTimer->isActive()) {
         // this timer is done, we can kill it
+        _timerFunctionMap.remove(callingTimer);
         delete callingTimer;
     }
 }