From bff1bdafaf584ce81b1370d04545e39ff56057f0 Mon Sep 17 00:00:00 2001 From: Aleksandar Andrejevic Date: Sun, 19 Oct 2014 15:02:37 +0000 Subject: [PATCH] [FAST486] The r64823 patch was not properly merged. svn path=/trunk/; revision=64824 --- reactos/lib/fast486/fast486.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/reactos/lib/fast486/fast486.c b/reactos/lib/fast486/fast486.c index 7725c9b8d83..9df60e5c462 100644 --- a/reactos/lib/fast486/fast486.c +++ b/reactos/lib/fast486/fast486.c @@ -85,11 +85,8 @@ NextInst: * Check if there is an interrupt to execute, or a hardware interrupt signal * while interrupts are enabled. */ - if (State->Flags.Tf) + if (State->Flags.Tf && !State->Halted) { - /* No longer halted */ - State->Halted = FALSE; - /* Perform the interrupt */ Fast486PerformInterrupt(State, 0x01); @@ -104,6 +101,9 @@ NextInst: } else if (State->IntStatus == FAST486_INT_EXECUTE) { + /* No longer halted */ + State->Halted = FALSE; + /* Perform the interrupt */ Fast486PerformInterrupt(State, State->PendingIntNum);