[ros-diffs] [aandrejevic] 64824: [FAST486] The r64823 patch was not properly merged.

Author: aandrejevic
Date: Sun Oct 19 15:02:37 2014
New Revision: 64824

URL: http://svn.reactos.org/svn/reactos?rev=64824&view=rev
Log:
[FAST486]
The r64823 patch was not properly merged.


Modified:
    trunk/reactos/lib/fast486/fast486.c

Modified: trunk/reactos/lib/fast486/fast486.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/fast486.c?rev=…
==============================================================================
--- trunk/reactos/lib/fast486/fast486.c	[iso-8859-1] (original)
+++ trunk/reactos/lib/fast486/fast486.c	[iso-8859-1] Sun Oct 19 15:02:37 2014
@@ -85,11 +85,8 @@
          * Check if there is an interrupt to execute, or a hardware interrupt signal
          * while interrupts are enabled.
          */
-        if (State->Flags.Tf)
-        {
-            /* No longer halted */
-            State->Halted = FALSE;
-
+        if (State->Flags.Tf && !State->Halted)
+        {
             /* Perform the interrupt */
             Fast486PerformInterrupt(State, 0x01);
 
@@ -104,6 +101,9 @@
         }
         else if (State->IntStatus == FAST486_INT_EXECUTE)
         {
+            /* No longer halted */
+            State->Halted = FALSE;
+
             /* Perform the interrupt */
             Fast486PerformInterrupt(State, State->PendingIntNum);