From 838d82d5dbb6cd34c2ac627d99cbc92f3f7b17d5 Mon Sep 17 00:00:00 2001 From: AJR Date: Thu, 7 May 2020 10:54:29 -0400 Subject: Fix focus command (nw) --- src/emu/debug/debugcpu.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/emu/debug/debugcpu.cpp') diff --git a/src/emu/debug/debugcpu.cpp b/src/emu/debug/debugcpu.cpp index 17468e6da49..a02aa9f49aa 100644 --- a/src/emu/debug/debugcpu.cpp +++ b/src/emu/debug/debugcpu.cpp @@ -1147,7 +1147,7 @@ void debugger_cpu::start_hook(device_t *device, bool stop_on_vblank) m_livecpu = device; // if we're a new device, stop now - if (m_stop_when_not_device != nullptr && m_stop_when_not_device != device) + if (m_stop_when_not_device != nullptr && m_stop_when_not_device != device && device->debug()->observing()) { m_stop_when_not_device = nullptr; m_execution_state = exec_state::STOPPED; @@ -1183,7 +1183,10 @@ void debugger_cpu::start_hook(device_t *device, bool stop_on_vblank) } // check for debug keypresses if (m_machine.ui_input().pressed(IPT_UI_DEBUG_BREAK)) + { + m_visiblecpu->debug()->ignore(false); m_visiblecpu->debug()->halt_on_next_instruction("User-initiated break\n"); + } } } -- cgit v1.2.3