CPU: Stop any old timers on reset.

nelhage · Jun 2, 2011 · 83fa893 · 83fa893
1 parent e778427
commit 83fa893
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/CPU.js b/CPU.js
@@ -198,15 +198,14 @@ var CPU = {
 
     reset: function(config) {
         var i;
+        CPU.pause();
         CPU.config = config;
         CPU.PC = ISR_RESET;
         for (i = 0; i < 32; i ++)
             CPU.regs[i] = 0;
         CPU.halt = false;
         CPU.pending_interrupts = 0;
         CPU.callback = null;
-        CPU.clock = null;
-        CPU.run_timer = null;
         CPU.key_buffer = [];
         CPU.mouse = null;
     },
@@ -251,10 +250,11 @@ var CPU = {
     },
 
     pause: function() {
-        clearTimeout(CPU.run_timer);
+        if (CPU.run_timer)
+            clearTimeout(CPU.run_timer);
+        CPU.run_timer = null;
         if (CPU.clock)
             clearInterval(CPU.clock);
-        CPU.run_timer = null;
         CPU.clock = null;
     },