Merge branch 'pr-1054' into presubmit-stable-pr-1054

karma-runner · May 10, 2014 · a1c9c9b · a1c9c9b
2 parents d11b753 + bd66274
commit a1c9c9b
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/lib/launchers/process.js b/lib/launchers/process.js
@@ -22,7 +22,7 @@ var ProcessLauncher = function(spawn, tempDir, timer) {
 
     onExitCallback = done;
     self._process.kill();
-    timer.setTimeout(self._onKillTimeout, killTimeout);
+    self._killTimer = timer.setTimeout(self._onKillTimeout, killTimeout);
   });
 
   this._start = function(url) {
@@ -110,6 +110,10 @@ var ProcessLauncher = function(spawn, tempDir, timer) {
     }
 
     self._process = null;
+    if (self._killTimer) {
+      timer.clearTimeout(self._killTimer);
+      self._killTimer = null;
+    }
     self._clearTempDirAndReportDone(error);
   };