From ee5d6ed6b26a609c5ce452515ac275e2c23addc5 Mon Sep 17 00:00:00 2001
From: Cyan <cyan06@users.noreply.github.com>
Date: Sun, 20 Jan 2013 11:09:43 +0000
Subject: [PATCH] * Fixed the bug introduced in r1208 preventing game launching
   with non d2x cIOS.

---
 HBC/META.XML                  | 4 ++--
 source/prompts/GameWindow.cpp | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/HBC/META.XML b/HBC/META.XML
index fc103d7e..bc394ca7 100644
--- a/HBC/META.XML
+++ b/HBC/META.XML
@@ -2,8 +2,8 @@
 	<app version="1">
 		<name> USB Loader GX</name>
 		<coder>USB Loader GX Team</coder>
-		<version>3.0 r1208</version>
-		<release_date>20130106131039</release_date>
+		<version>3.0 r1209</version>
+		<release_date>20130120104022</release_date>
 		<!--   // remove this line to enable arguments
 		<arguments>
 				<arg>--ios=250</arg>
diff --git a/source/prompts/GameWindow.cpp b/source/prompts/GameWindow.cpp
index 8ddb9d4e..b2abbc3e 100644
--- a/source/prompts/GameWindow.cpp
+++ b/source/prompts/GameWindow.cpp
@@ -719,6 +719,7 @@ void GameWindow::BootGame(struct discHdr *header)
 	snprintf(IDfull, sizeof(IDfull), "%s", (char *) header->id);
 
 	int gameIOS = game_cfg->ios == INHERIT ? Settings.cios : game_cfg->ios;
+	int gameNandEmuMode = game_cfg->NandEmuMode == INHERIT ? Settings.NandEmuMode : game_cfg->NandEmuMode;
 
 	if (game_cfg->loadalternatedol == 2)
 	{
@@ -771,7 +772,7 @@ void GameWindow::BootGame(struct discHdr *header)
 	// Restrict emuNAND with Wii games only with d2x
 	if(header->type == TYPE_GAME_WII_IMG || header->type == TYPE_GAME_WII_DISC)
 	{
-		if(!IosLoader::IsD2X(gameIOS))
+		if(gameNandEmuMode && !IosLoader::IsD2X(gameIOS))
 		{
 			ShowError(tr("Launching Wii games with emulated nand only works on d2x cIOS! Change game IOS to a d2x cIOS first."));
 			return;