From c2476f1d360f6646d461d82b7209190783bf0e20 Mon Sep 17 00:00:00 2001
From: alyosha-tas <alexei.f.k@gmail.com>
Date: Wed, 28 Jun 2017 16:34:01 -0400
Subject: [PATCH] Z80: Actually upload the correct file >__>

---
 BizHawk.Emulation.Cores/CPUs/Z80/Execute.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/BizHawk.Emulation.Cores/CPUs/Z80/Execute.cs b/BizHawk.Emulation.Cores/CPUs/Z80/Execute.cs
index c641591d66..346335ee1c 100644
--- a/BizHawk.Emulation.Cores/CPUs/Z80/Execute.cs
+++ b/BizHawk.Emulation.Cores/CPUs/Z80/Execute.cs
@@ -11904,6 +11904,7 @@ namespace BizHawk.Emulation.Cores.Components.Z80
 					}
 
 				}
+				bool int_triggered = false;
 
 				// Process interrupt requests.
 				if (nonMaskableInterruptPending)
@@ -11923,6 +11924,7 @@ namespace BizHawk.Emulation.Cores.Components.Z80
 				}
 				else if (iff1 && interrupt && Interruptable)
 				{
+					int_triggered = true;
 
 					Halted = false;
 
@@ -11952,11 +11954,12 @@ namespace BizHawk.Emulation.Cores.Components.Z80
 				if (EI_pending > 0)
 				{
 					EI_pending--;
-					if (EI_pending == 0)
+					if (EI_pending == 0 && !int_triggered)
 					{
 						IFF1 = IFF2 = true;
 					}
 				}
+
 			}
 		}