From 1b91aa6bca66248cde00d3d6fcd71304321249b5 Mon Sep 17 00:00:00 2001
From: zeromus <zeromus@zeromus.org>
Date: Thu, 8 Mar 2012 04:48:14 +0000
Subject: [PATCH] nes-fix bug in xml parsing which made games with multiple
 carts (unusual) not detect subsequent carts

---
 .../Consoles/Nintendo/NES/BoardSystem.cs      | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/BoardSystem.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/BoardSystem.cs
index 171cde7608..8a852eed61 100644
--- a/BizHawk.Emulation/Consoles/Nintendo/NES/BoardSystem.cs
+++ b/BizHawk.Emulation/Consoles/Nintendo/NES/BoardSystem.cs
@@ -375,16 +375,6 @@ namespace BizHawk.Emulation.Consoles.Nintendo
 								state = 1;
 							}
 							break;
-						case 1:
-							if (xmlreader.NodeType == XmlNodeType.Element && xmlreader.Name == "cartridge")
-							{
-								currCart = new CartInfo();
-								currCart.game = currGame;
-								currCart.system = xmlreader.GetAttribute("system");
-								currCart.sha1 = "sha1:" + xmlreader.GetAttribute("sha1");
-								state = 2;
-							}
-							break;
 						case 2:
 							if (xmlreader.NodeType == XmlNodeType.Element && xmlreader.Name == "board")
 							{
@@ -438,6 +428,15 @@ namespace BizHawk.Emulation.Consoles.Nintendo
 							}
 							break;
 						case 5:
+						case 1:
+							if (xmlreader.NodeType == XmlNodeType.Element && xmlreader.Name == "cartridge")
+							{
+								currCart = new CartInfo();
+								currCart.game = currGame;
+								currCart.system = xmlreader.GetAttribute("system");
+								currCart.sha1 = "sha1:" + xmlreader.GetAttribute("sha1");
+								state = 2;
+							}
 							if (xmlreader.NodeType == XmlNodeType.EndElement && xmlreader.Name == "game")
 							{
 								games.Add(currGame);