From: Toni Wilen Date: Thu, 1 Jan 2015 11:11:45 +0000 (+0200) Subject: Ignore keyboard reset warning if CPU is halted. X-Git-Tag: 3100~159 X-Git-Url: https://git.unchartedbackwaters.co.uk/w/?a=commitdiff_plain;h=648e3b2100f268be7188ad4354190ddb4060e53a;p=francis%2Fwinuae.git Ignore keyboard reset warning if CPU is halted. --- diff --git a/cia.cpp b/cia.cpp index 39d347bc..80332739 100644 --- a/cia.cpp +++ b/cia.cpp @@ -637,7 +637,7 @@ static void sendrw (void) int resetwarning_do (int canreset) { - if (resetwarning_phase) { + if (resetwarning_phase || regs.halted > 0) { /* just force reset if second reset happens during resetwarning */ if (canreset) { resetwarning_phase = 0;