summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Zsolt Vasvari <zsoltvas@mamedev.org>2008-03-05 04:20:01 +0000
committer Zsolt Vasvari <zsoltvas@mamedev.org>2008-03-05 04:20:01 +0000
commit793cf2e715dc3d74c8dbf256f6bd77d48719e400 (patch)
tree65ec49f4f216eaf3c1ae9d451fdbbef8eb67a87d
parent0eca6ca59ca64bd7d1615bb283d029be3bbebcf8 (diff)
VBLANK based watchdogs can be disabled once again
Removed debugging fprintf
-rw-r--r--src/emu/debug/debugcpu.c1
-rw-r--r--src/emu/watchdog.c2
2 files changed, 1 insertions, 2 deletions
diff --git a/src/emu/debug/debugcpu.c b/src/emu/debug/debugcpu.c
index 0ba3ebd02d2..00cb819fac0 100644
--- a/src/emu/debug/debugcpu.c
+++ b/src/emu/debug/debugcpu.c
@@ -296,7 +296,6 @@ void debug_cpu_init(running_machine *machine)
}
/* add callback for breaking on VBLANK */
-fprintf(stderr,"Debug 1\n");
video_screen_register_vbl_cb(machine, NULL, on_vblank);
add_exit_callback(machine, debug_cpu_exit);
diff --git a/src/emu/watchdog.c b/src/emu/watchdog.c
index 676f68225b7..60bd49c3cf7 100644
--- a/src/emu/watchdog.c
+++ b/src/emu/watchdog.c
@@ -86,7 +86,7 @@ static TIMER_CALLBACK( watchdog_callback )
static void on_vblank(running_machine *machine, screen_state *screen, int vblank_state)
{
/* VBLANK starting */
- if (vblank_state)
+ if (vblank_state && watchdog_enabled)
{
/* check the watchdog */
if (machine->config->watchdog_vblank_count != 0 && --watchdog_counter == 0)