* Fixed the bug introduced in r1208 preventing game launching

with non d2x cIOS.
This commit is contained in:
Cyan 2013-01-20 11:09:43 +00:00
parent 5adbf57bf5
commit ee5d6ed6b2
2 changed files with 4 additions and 3 deletions

View File

@ -2,8 +2,8 @@
<app version="1"> <app version="1">
<name> USB Loader GX</name> <name> USB Loader GX</name>
<coder>USB Loader GX Team</coder> <coder>USB Loader GX Team</coder>
<version>3.0 r1208</version> <version>3.0 r1209</version>
<release_date>20130106131039</release_date> <release_date>20130120104022</release_date>
<!-- // remove this line to enable arguments <!-- // remove this line to enable arguments
<arguments> <arguments>
<arg>--ios=250</arg> <arg>--ios=250</arg>

View File

@ -719,6 +719,7 @@ void GameWindow::BootGame(struct discHdr *header)
snprintf(IDfull, sizeof(IDfull), "%s", (char *) header->id); snprintf(IDfull, sizeof(IDfull), "%s", (char *) header->id);
int gameIOS = game_cfg->ios == INHERIT ? Settings.cios : game_cfg->ios; 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) if (game_cfg->loadalternatedol == 2)
{ {
@ -771,7 +772,7 @@ void GameWindow::BootGame(struct discHdr *header)
// Restrict emuNAND with Wii games only with d2x // Restrict emuNAND with Wii games only with d2x
if(header->type == TYPE_GAME_WII_IMG || header->type == TYPE_GAME_WII_DISC) 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.")); ShowError(tr("Launching Wii games with emulated nand only works on d2x cIOS! Change game IOS to a d2x cIOS first."));
return; return;