From 999f97f25ae9b2d751b830cda132e1a41d40bed6 Mon Sep 17 00:00:00 2001
From: dimok321 <15055714+dimok789@users.noreply.github.com>
Date: Tue, 26 Jul 2011 19:34:16 +0000
Subject: [PATCH] *Removed check for d2x cIOS right before activation of NAND
 Emu because it is invalid at that place in code (fix for nand emu)

---
 HBC/META.XML                 | 4 ++--
 gui.pnproj                   | 2 +-
 source/usbloader/NandEmu.cpp | 9 ---------
 3 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/HBC/META.XML b/HBC/META.XML
index 02f82911..2d3abcc1 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>2.2 r1106</version>
-		<release_date>201107260730</release_date>
+		<version>2.2 r1107</version>
+		<release_date>201107260854</release_date>
 		<!--   // remove this line to enable arguments
 		<arguments>
 				<arg>--ios=250</arg>
diff --git a/gui.pnproj b/gui.pnproj
index 639fd190..85e07a15 100644
--- a/gui.pnproj
+++ b/gui.pnproj
@@ -1 +1 @@
-<Project name="gui"><MagicFolder excludeFolders="CVS;.svn" filter="*" name="source" path="source\"><MagicFolder excludeFolders="CVS;.svn" filter="*" name="banner" path="banner\"><File path="OpeningBNR.cpp"></File><File path="OpeningBNR.hpp"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="BoxCover" path="BoxCover\"><File path="BoxCover.cpp"></File><File path="BoxCover.hpp"></File><File path="BoxMesh.cpp"></File><File path="BoxMesh.hpp"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="cheats" path="cheats\"><File path="cheatmenu.cpp"></File><File path="cheatmenu.h"></File><File path="gct.cpp"></File><File path="gct.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="Controls" path="Controls\"><File path="DeviceHandler.cpp"></File><File path="DeviceHandler.hpp"></File><File path="PartitionHandle.cpp"></File><File path="PartitionHandle.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="FileOperations" path="FileOperations\"><File path="DirList.cpp"></File><File path="DirList.h"></File><File path="File.cpp"></File><File path="File.hpp"></File><File path="fileops.cpp"></File><File path="fileops.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="GUI" path="GUI\"><File path="gui.h"></File><File path="gui_box.cpp"></File><File path="gui_box.hpp"></File><File path="gui_button.cpp"></File><File path="gui_checkbox.cpp"></File><File path="gui_checkbox.hpp"></File><File path="gui_checkboxbrowser.cpp"></File><File path="gui_checkboxbrowser.hpp"></File><File path="gui_checksign.cpp"></File><File path="gui_checksign.hpp"></File><File path="gui_circle.cpp"></File><File path="gui_circle.hpp"></File><File path="gui_cross.cpp"></File><File path="gui_cross.hpp"></File><File path="gui_diskcover.cpp"></File><File path="gui_diskcover.h"></File><File path="gui_element.cpp"></File><File path="gui_filebrowser.cpp"></File><File path="gui_filebrowser.h"></File><File path="gui_gamebrowser.h"></File><File path="gui_gamecarousel.cpp"></File><File path="gui_gamecarousel.h"></File><File path="gui_gamegrid.cpp"></File><File path="gui_gamegrid.h"></File><File path="gui_gamelist.cpp"></File><File path="gui_gamelist.h"></File><File path="gui_image.cpp"></File><File path="gui_imagedata.cpp"></File><File path="gui_imagedata.h"></File><File path="gui_image_async.cpp"></File><File path="gui_image_async.h"></File><File path="gui_keyboard.cpp"></File><File path="gui_numpad.cpp"></File><File path="gui_optionbrowser.cpp"></File><File path="gui_optionbrowser.h"></File><File path="gui_scrollbar.cpp"></File><File path="gui_scrollbar.hpp"></File><File path="gui_searchbar.cpp"></File><File path="gui_searchbar.h"></File><File path="gui_text.cpp"></File><File path="gui_tooltip.cpp"></File><File path="gui_trigger.cpp"></File><File path="gui_window.cpp"></File><File path="LoadCoverImage.cpp"></File><File path="LoadCoverImage.h"></File><File path="OptionList.cpp"></File><File path="OptionList.hpp"></File><File path="sigslot.h"></File><File path="Text.cpp"></File><File path="Text.hpp"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="homebrewboot" path="homebrewboot\"><File path="BootHomebrew.cpp"></File><File path="BootHomebrew.h"></File><File path="HomebrewBrowser.cpp"></File><File path="HomebrewBrowser.hpp"></File><File path="HomebrewXML.cpp"></File><File path="HomebrewXML.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="ImageOperations" path="ImageOperations\"><File path="TextureConverter.c"></File><File path="TextureConverter.h"></File><File path="TplImage.cpp"></File><File path="TplImage.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="language" path="language\"><File path="gettext.c"></File><File path="gettext.h"></File><File path="UpdateLanguage.cpp"></File><File path="UpdateLanguage.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="libs" path="libs\"><MagicFolder excludeFolders="CVS;.svn" filter="*" name="libext2fs" path="libext2fs\"><File path="ext2_frag.h"></File><File path="libcustomext2fs.a"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="libfat" path="libfat\"><File path="fatfile_frag.h"></File><File path="libcustomfat.a"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="libntfs" path="libntfs\"><File path="libcustomntfs.a"></File><File path="ntfsfile_frag.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="libwbfs" path="libwbfs\"><File path="libwbfs.c"></File><File path="libwbfs.h"></File><File path="libwbfs_os.h"></File><File path="rijndael.c"></File><File path="wiidisc.c"></File><File path="wiidisc.h"></File></MagicFolder></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="memory" path="memory\"><File path="mem2.cpp"></File><File path="mem2.h"></File><File path="mem2alloc.cpp"></File><File path="mem2alloc.hpp"></File><File path="memory.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="menu" path="menu\"><File path="GameBrowseMenu.cpp"></File><File path="GameBrowseMenu.hpp"></File><File path="menus.h"></File><File path="menu_install.cpp"></File><File path="menu_partition_selection.cpp"></File><File path="WDMMenu.cpp"></File><File path="WDMMenu.hpp"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="mload" path="mload\"><MagicFolder excludeFolders="CVS;.svn" filter="*" name="modules" path="modules\"><File path="dip_plugin_249.c"></File><File path="dip_plugin_249.h"></File><File path="ehcmodule_5.c"></File><File path="ehcmodule_5.h"></File><File path="odip_frag.c"></File><File path="odip_frag.h"></File></MagicFolder><File path="mload.c"></File><File path="mload.h"></File><File path="mload_modules.c"></File><File path="mload_modules.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="network" path="network\"><File path="dns.c"></File><File path="dns.h"></File><File path="FileDownloader.cpp"></File><File path="FileDownloader.h"></File><File path="HTML_Stream.cpp"></File><File path="HTML_Stream.h"></File><File path="http.c"></File><File path="http.h"></File><File path="ImageDownloader.cpp"></File><File path="ImageDownloader.h"></File><File path="networkops.cpp"></File><File path="networkops.h"></File><File path="update.cpp"></File><File path="update.h"></File><File path="URL_List.cpp"></File><File path="URL_List.h"></File><File path="Wiinnertag.cpp"></File><File path="Wiinnertag.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="patches" path="patches\"><File path="codehandler.h"></File><File path="codehandleronly.h"></File><File path="dolpatcher.c"></File><File path="dolpatcher.h"></File><File path="dvd_broadway.c"></File><File path="dvd_broadway.h"></File><File path="fst.c"></File><File path="fst.h"></File><File path="fwrite_patch.h"></File><File path="gamepatches.c"></File><File path="gamepatches.h"></File><File path="geckomenu.h"></File><File path="kenobiwii.h"></File><File path="multidol.c"></File><File path="multidol.h"></File><File path="patchcode.c"></File><File path="patchcode.h"></File><File path="patchhook.S"></File><File path="ppc.h"></File><File path="wip.cpp"></File><File path="wip.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="prompts" path="prompts\"><File path="CategoryPrompt.cpp"></File><File path="CategoryPrompt.hpp"></File><File path="CategorySelectPrompt.cpp"></File><File path="CategorySelectPrompt.hpp"></File><File path="CategorySwitchPrompt.cpp"></File><File path="CategorySwitchPrompt.hpp"></File><File path="CheckboxPrompt.cpp"></File><File path="CheckboxPrompt.hpp"></File><File path="DiscBrowser.cpp"></File><File path="DiscBrowser.h"></File><File path="filebrowser.cpp"></File><File path="filebrowser.h"></File><File path="gameinfo.cpp"></File><File path="gameinfo.h"></File><File path="GameWindow.cpp"></File><File path="GameWindow.hpp"></File><File path="HomebrewPrompt.cpp"></File><File path="HomebrewPrompt.hpp"></File><File path="ProgressWindow.cpp"></File><File path="ProgressWindow.h"></File><File path="PromptWindow.cpp"></File><File path="PromptWindow.hpp"></File><File path="PromptWindows.cpp"></File><File path="PromptWindows.h"></File><File path="TitleBrowser.cpp"></File><File path="TitleBrowser.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="settings" path="settings\"><MagicFolder excludeFolders="CVS;.svn" filter="*" name="menus" path="menus\"><File path="CustomPathsSM.cpp"></File><File path="CustomPathsSM.hpp"></File><File path="FeatureSettingsMenu.cpp"></File><File path="FeatureSettingsMenu.hpp"></File><File path="FlyingButtonsMenu.cpp"></File><File path="FlyingButtonsMenu.hpp"></File><File path="GameLoadSM.cpp"></File><File path="GameLoadSM.hpp"></File><File path="GameSettingsMenu.cpp"></File><File path="GameSettingsMenu.hpp"></File><File path="GlobalSettings.cpp"></File><File path="GlobalSettings.hpp"></File><File path="GUISettingsMenu.cpp"></File><File path="GUISettingsMenu.hpp"></File><File path="HardDriveSM.cpp"></File><File path="HardDriveSM.hpp"></File><File path="LoaderSettings.cpp"></File><File path="LoaderSettings.hpp"></File><File path="ParentalControlSM.cpp"></File><File path="ParentalControlSM.hpp"></File><File path="SettingsMenu.cpp"></File><File path="SettingsMenu.hpp"></File><File path="SoundSettingsMenu.cpp"></File><File path="SoundSettingsMenu.hpp"></File><File path="UninstallSM.cpp"></File><File path="UninstallSM.hpp"></File></MagicFolder><File path="CCategoryList.cpp"></File><File path="CCategoryList.hpp"></File><File path="CGameCategories.cpp"></File><File path="CGameCategories.hpp"></File><File path="CGameSettings.cpp"></File><File path="CGameSettings.h"></File><File path="CGameStatistics.cpp"></File><File path="CGameStatistics.h"></File><File path="CSettings.cpp"></File><File path="CSettings.h"></File><File path="GameTitles.cpp"></File><File path="GameTitles.h"></File><File path="newtitles.cpp"></File><File path="newtitles.h"></File><File path="SettingsEnums.h"></File><File path="SettingsPrompts.cpp"></File><File path="SettingsPrompts.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="SoundOperations" path="SoundOperations\"><File path="AifDecoder.cpp"></File><File path="AifDecoder.hpp"></File><File path="BNSDecoder.cpp"></File><File path="BNSDecoder.hpp"></File><File path="BufferCircle.cpp"></File><File path="BufferCircle.hpp"></File><File path="gui_bgm.cpp"></File><File path="gui_bgm.h"></File><File path="gui_sound.cpp"></File><File path="gui_sound.h"></File><File path="Mp3Decoder.cpp"></File><File path="Mp3Decoder.hpp"></File><File path="OggDecoder.cpp"></File><File path="OggDecoder.hpp"></File><File path="SoundDecoder.cpp"></File><File path="SoundDecoder.hpp"></File><File path="SoundHandler.cpp"></File><File path="SoundHandler.hpp"></File><File path="WavDecoder.cpp"></File><File path="WavDecoder.hpp"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="system" path="system\"><File path="IosLoader.cpp"></File><File path="IosLoader.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="themes" path="themes\"><File path="CTheme.cpp"></File><File path="CTheme.h"></File><File path="filelist.h"></File><File path="gettheme.c"></File><File path="gettheme.h"></File><File path="Resources.cpp"></File><File path="Resources.h"></File><File path="ThemeDownloader.cpp"></File><File path="ThemeDownloader.h"></File><File path="ThemeMenu.cpp"></File><File path="ThemeMenu.h"></File><File path="Theme_List.cpp"></File><File path="Theme_List.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="usbloader" path="usbloader\"><MagicFolder excludeFolders="CVS;.svn" filter="*" name="wbfs" path="wbfs\"><File path="wbfs_base.cpp"></File><File path="wbfs_base.h"></File><File path="wbfs_ext.h"></File><File path="wbfs_fat.cpp"></File><File path="wbfs_fat.h"></File><File path="wbfs_ntfs.h"></File><File path="wbfs_rw.c"></File><File path="wbfs_rw.h"></File><File path="wbfs_wbfs.cpp"></File><File path="wbfs_wbfs.h"></File></MagicFolder><File path="alternatedol.c"></File><File path="alternatedol.h"></File><File path="AlternateDOLOffsets.cpp"></File><File path="AlternateDOLOffsets.h"></File><File path="apploader.c"></File><File path="apploader.h"></File><File path="disc.c"></File><File path="disc.h"></File><File path="frag.c"></File><File path="frag.h"></File><File path="fstfile.c"></File><File path="fstfile.h"></File><File path="GameBooter.cpp"></File><File path="GameBooter.hpp"></File><File path="GameList.cpp"></File><File path="GameList.h"></File><File path="GetMissingGameFiles.cpp"></File><File path="GetMissingGameFiles.hpp"></File><File path="MountGamePartition.cpp"></File><File path="MountGamePartition.h"></File><File path="nand.c"></File><File path="nand.h"></File><File path="playlog.c"></File><File path="playlog.h"></File><File path="SavePath.cpp"></File><File path="SavePath.h"></File><File path="sdhc.c"></File><File path="sdhc.h"></File><File path="splits.c"></File><File path="splits.h"></File><File path="usbstorage2.c"></File><File path="usbstorage2.h"></File><File path="utils.c"></File><File path="utils.h"></File><File path="wbfs.cpp"></File><File path="wbfs.h"></File><File path="WDMFile.cpp"></File><File path="WDMFile.hpp"></File><File path="wdvd.c"></File><File path="wdvd.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="utils" path="utils\"><MagicFolder excludeFolders="CVS;.svn" filter="*" name="minizip" path="minizip\"><File path="miniunz.c"></File><File path="miniunz.h"></File></MagicFolder><File path="Callback.hpp"></File><File path="encrypt.c"></File><File path="encrypt.h"></File><File path="MD5.c"></File><File path="MD5.h"></File><File path="PasswordCheck.cpp"></File><File path="PasswordCheck.h"></File><File path="ResourceManager.cpp"></File><File path="ResourceManager.h"></File><File path="rockout.cpp"></File><File path="rockout.h"></File><File path="ShowError.cpp"></File><File path="ShowError.h"></File><File path="StringTools.c"></File><File path="StringTools.h"></File><File path="ThreadedTask.cpp"></File><File path="ThreadedTask.hpp"></File><File path="timer.c"></File><File path="timer.h"></File><File path="tools.h"></File><File path="uncompress.c"></File><File path="uncompress.h"></File><File path="wifi_gecko.c"></File><File path="wifi_gecko.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="wad" path="wad\"><File path="nandtitle.cpp"></File><File path="nandtitle.h"></File><File path="utils.h"></File><File path="wad.cpp"></File><File path="wad.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="xml" path="xml\"><File path="tinyxml.cpp"></File><File path="tinyxml.h"></File><File path="tinyxmlerror.cpp"></File><File path="tinyxmlparser.cpp"></File><File path="WiiTDB.cpp"></File><File path="WiiTDB.hpp"></File></MagicFolder><File path="audio.cpp"></File><File path="audio.h"></File><File path="FreeTypeGX.cpp"></File><File path="FreeTypeGX.h"></File><File path="gecko.c"></File><File path="gecko.h"></File><File path="input.cpp"></File><File path="input.h"></File><File path="lstub.cpp"></File><File path="lstub.h"></File><File path="main.cpp"></File><File path="main.h"></File><File path="menu.cpp"></File><File path="menu.h"></File><File path="StartUpProcess.cpp"></File><File path="StartUpProcess.h"></File><File path="svnrev.c"></File><File path="svnrev.h"></File><File path="sys.cpp"></File><File path="sys.h"></File><File path="video.cpp"></File><File path="video.h"></File><File path="wpad.c"></File><File path="wpad.h"></File><File path="wstring.cpp"></File><File path="wstring.hpp"></File><File path="ZipFile.cpp"></File><File path="ZipFile.h"></File></MagicFolder><File path="Makefile"></File></Project>
\ No newline at end of file
+<Project name="gui"><MagicFolder excludeFolders="CVS;.svn" filter="*" name="source" path="source\"><MagicFolder excludeFolders="CVS;.svn" filter="*" name="banner" path="banner\"><File path="OpeningBNR.cpp"></File><File path="OpeningBNR.hpp"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="BoxCover" path="BoxCover\"><File path="BoxCover.cpp"></File><File path="BoxCover.hpp"></File><File path="BoxMesh.cpp"></File><File path="BoxMesh.hpp"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="cheats" path="cheats\"><File path="cheatmenu.cpp"></File><File path="cheatmenu.h"></File><File path="gct.cpp"></File><File path="gct.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="Controls" path="Controls\"><File path="DeviceHandler.cpp"></File><File path="DeviceHandler.hpp"></File><File path="PartitionHandle.cpp"></File><File path="PartitionHandle.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="FileOperations" path="FileOperations\"><File path="DirList.cpp"></File><File path="DirList.h"></File><File path="File.cpp"></File><File path="File.hpp"></File><File path="fileops.cpp"></File><File path="fileops.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="GUI" path="GUI\"><File path="gui.h"></File><File path="gui_box.cpp"></File><File path="gui_box.hpp"></File><File path="gui_button.cpp"></File><File path="gui_checkbox.cpp"></File><File path="gui_checkbox.hpp"></File><File path="gui_checkboxbrowser.cpp"></File><File path="gui_checkboxbrowser.hpp"></File><File path="gui_checksign.cpp"></File><File path="gui_checksign.hpp"></File><File path="gui_circle.cpp"></File><File path="gui_circle.hpp"></File><File path="gui_cross.cpp"></File><File path="gui_cross.hpp"></File><File path="gui_diskcover.cpp"></File><File path="gui_diskcover.h"></File><File path="gui_element.cpp"></File><File path="gui_filebrowser.cpp"></File><File path="gui_filebrowser.h"></File><File path="gui_gamebrowser.h"></File><File path="gui_gamecarousel.cpp"></File><File path="gui_gamecarousel.h"></File><File path="gui_gamegrid.cpp"></File><File path="gui_gamegrid.h"></File><File path="gui_gamelist.cpp"></File><File path="gui_gamelist.h"></File><File path="gui_image.cpp"></File><File path="gui_imagedata.cpp"></File><File path="gui_imagedata.h"></File><File path="gui_image_async.cpp"></File><File path="gui_image_async.h"></File><File path="gui_keyboard.cpp"></File><File path="gui_numpad.cpp"></File><File path="gui_optionbrowser.cpp"></File><File path="gui_optionbrowser.h"></File><File path="gui_scrollbar.cpp"></File><File path="gui_scrollbar.hpp"></File><File path="gui_searchbar.cpp"></File><File path="gui_searchbar.h"></File><File path="gui_text.cpp"></File><File path="gui_tooltip.cpp"></File><File path="gui_trigger.cpp"></File><File path="gui_window.cpp"></File><File path="LoadCoverImage.cpp"></File><File path="LoadCoverImage.h"></File><File path="OptionList.cpp"></File><File path="OptionList.hpp"></File><File path="sigslot.h"></File><File path="Text.cpp"></File><File path="Text.hpp"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="homebrewboot" path="homebrewboot\"><File path="BootHomebrew.cpp"></File><File path="BootHomebrew.h"></File><File path="HomebrewBrowser.cpp"></File><File path="HomebrewBrowser.hpp"></File><File path="HomebrewXML.cpp"></File><File path="HomebrewXML.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="ImageOperations" path="ImageOperations\"><File path="TextureConverter.c"></File><File path="TextureConverter.h"></File><File path="TplImage.cpp"></File><File path="TplImage.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="language" path="language\"><File path="gettext.c"></File><File path="gettext.h"></File><File path="UpdateLanguage.cpp"></File><File path="UpdateLanguage.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="libs" path="libs\"><MagicFolder excludeFolders="CVS;.svn" filter="*" name="libext2fs" path="libext2fs\"><File path="ext2_frag.h"></File><File path="libcustomext2fs.a"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="libfat" path="libfat\"><File path="fatfile_frag.h"></File><File path="libcustomfat.a"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="libntfs" path="libntfs\"><File path="libcustomntfs.a"></File><File path="ntfsfile_frag.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="libwbfs" path="libwbfs\"><File path="libwbfs.c"></File><File path="libwbfs.h"></File><File path="libwbfs_os.h"></File><File path="rijndael.c"></File><File path="wiidisc.c"></File><File path="wiidisc.h"></File></MagicFolder></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="memory" path="memory\"><File path="mem2.cpp"></File><File path="mem2.h"></File><File path="mem2alloc.cpp"></File><File path="mem2alloc.hpp"></File><File path="memory.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="menu" path="menu\"><File path="GameBrowseMenu.cpp"></File><File path="GameBrowseMenu.hpp"></File><File path="menus.h"></File><File path="menu_install.cpp"></File><File path="menu_partition_selection.cpp"></File><File path="WDMMenu.cpp"></File><File path="WDMMenu.hpp"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="mload" path="mload\"><MagicFolder excludeFolders="CVS;.svn" filter="*" name="modules" path="modules\"><File path="dip_plugin_249.c"></File><File path="dip_plugin_249.h"></File><File path="ehcmodule_5.c"></File><File path="ehcmodule_5.h"></File><File path="odip_frag.c"></File><File path="odip_frag.h"></File></MagicFolder><File path="mload.c"></File><File path="mload.h"></File><File path="mload_modules.c"></File><File path="mload_modules.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="network" path="network\"><File path="dns.c"></File><File path="dns.h"></File><File path="FileDownloader.cpp"></File><File path="FileDownloader.h"></File><File path="HTML_Stream.cpp"></File><File path="HTML_Stream.h"></File><File path="http.c"></File><File path="http.h"></File><File path="ImageDownloader.cpp"></File><File path="ImageDownloader.h"></File><File path="networkops.cpp"></File><File path="networkops.h"></File><File path="update.cpp"></File><File path="update.h"></File><File path="URL_List.cpp"></File><File path="URL_List.h"></File><File path="Wiinnertag.cpp"></File><File path="Wiinnertag.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="patches" path="patches\"><File path="codehandler.h"></File><File path="codehandleronly.h"></File><File path="dolpatcher.c"></File><File path="dolpatcher.h"></File><File path="dvd_broadway.c"></File><File path="dvd_broadway.h"></File><File path="fst.c"></File><File path="fst.h"></File><File path="fwrite_patch.h"></File><File path="gamepatches.c"></File><File path="gamepatches.h"></File><File path="geckomenu.h"></File><File path="kenobiwii.h"></File><File path="multidol.c"></File><File path="multidol.h"></File><File path="patchcode.c"></File><File path="patchcode.h"></File><File path="patchhook.S"></File><File path="ppc.h"></File><File path="wip.cpp"></File><File path="wip.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="prompts" path="prompts\"><File path="CategoryPrompt.cpp"></File><File path="CategoryPrompt.hpp"></File><File path="CategorySelectPrompt.cpp"></File><File path="CategorySelectPrompt.hpp"></File><File path="CategorySwitchPrompt.cpp"></File><File path="CategorySwitchPrompt.hpp"></File><File path="CheckboxPrompt.cpp"></File><File path="CheckboxPrompt.hpp"></File><File path="DiscBrowser.cpp"></File><File path="DiscBrowser.h"></File><File path="filebrowser.cpp"></File><File path="filebrowser.h"></File><File path="gameinfo.cpp"></File><File path="gameinfo.h"></File><File path="GameWindow.cpp"></File><File path="GameWindow.hpp"></File><File path="HomebrewPrompt.cpp"></File><File path="HomebrewPrompt.hpp"></File><File path="ProgressWindow.cpp"></File><File path="ProgressWindow.h"></File><File path="PromptWindow.cpp"></File><File path="PromptWindow.hpp"></File><File path="PromptWindows.cpp"></File><File path="PromptWindows.h"></File><File path="TitleBrowser.cpp"></File><File path="TitleBrowser.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="settings" path="settings\"><MagicFolder excludeFolders="CVS;.svn" filter="*" name="menus" path="menus\"><File path="CustomPathsSM.cpp"></File><File path="CustomPathsSM.hpp"></File><File path="FeatureSettingsMenu.cpp"></File><File path="FeatureSettingsMenu.hpp"></File><File path="FlyingButtonsMenu.cpp"></File><File path="FlyingButtonsMenu.hpp"></File><File path="GameLoadSM.cpp"></File><File path="GameLoadSM.hpp"></File><File path="GameSettingsMenu.cpp"></File><File path="GameSettingsMenu.hpp"></File><File path="GlobalSettings.cpp"></File><File path="GlobalSettings.hpp"></File><File path="GUISettingsMenu.cpp"></File><File path="GUISettingsMenu.hpp"></File><File path="HardDriveSM.cpp"></File><File path="HardDriveSM.hpp"></File><File path="LoaderSettings.cpp"></File><File path="LoaderSettings.hpp"></File><File path="ParentalControlSM.cpp"></File><File path="ParentalControlSM.hpp"></File><File path="SettingsMenu.cpp"></File><File path="SettingsMenu.hpp"></File><File path="SoundSettingsMenu.cpp"></File><File path="SoundSettingsMenu.hpp"></File><File path="UninstallSM.cpp"></File><File path="UninstallSM.hpp"></File></MagicFolder><File path="CCategoryList.cpp"></File><File path="CCategoryList.hpp"></File><File path="CGameCategories.cpp"></File><File path="CGameCategories.hpp"></File><File path="CGameSettings.cpp"></File><File path="CGameSettings.h"></File><File path="CGameStatistics.cpp"></File><File path="CGameStatistics.h"></File><File path="CSettings.cpp"></File><File path="CSettings.h"></File><File path="GameTitles.cpp"></File><File path="GameTitles.h"></File><File path="newtitles.cpp"></File><File path="newtitles.h"></File><File path="SettingsEnums.h"></File><File path="SettingsPrompts.cpp"></File><File path="SettingsPrompts.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="SoundOperations" path="SoundOperations\"><File path="AifDecoder.cpp"></File><File path="AifDecoder.hpp"></File><File path="BNSDecoder.cpp"></File><File path="BNSDecoder.hpp"></File><File path="BufferCircle.cpp"></File><File path="BufferCircle.hpp"></File><File path="gui_bgm.cpp"></File><File path="gui_bgm.h"></File><File path="gui_sound.cpp"></File><File path="gui_sound.h"></File><File path="Mp3Decoder.cpp"></File><File path="Mp3Decoder.hpp"></File><File path="OggDecoder.cpp"></File><File path="OggDecoder.hpp"></File><File path="SoundDecoder.cpp"></File><File path="SoundDecoder.hpp"></File><File path="SoundHandler.cpp"></File><File path="SoundHandler.hpp"></File><File path="WavDecoder.cpp"></File><File path="WavDecoder.hpp"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="system" path="system\"><File path="IosLoader.cpp"></File><File path="IosLoader.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="themes" path="themes\"><File path="CTheme.cpp"></File><File path="CTheme.h"></File><File path="filelist.h"></File><File path="gettheme.c"></File><File path="gettheme.h"></File><File path="Resources.cpp"></File><File path="Resources.h"></File><File path="ThemeDownloader.cpp"></File><File path="ThemeDownloader.h"></File><File path="ThemeMenu.cpp"></File><File path="ThemeMenu.h"></File><File path="Theme_List.cpp"></File><File path="Theme_List.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="usbloader" path="usbloader\"><MagicFolder excludeFolders="CVS;.svn" filter="*" name="wbfs" path="wbfs\"><File path="wbfs_base.cpp"></File><File path="wbfs_base.h"></File><File path="wbfs_ext.h"></File><File path="wbfs_fat.cpp"></File><File path="wbfs_fat.h"></File><File path="wbfs_ntfs.h"></File><File path="wbfs_rw.c"></File><File path="wbfs_rw.h"></File><File path="wbfs_wbfs.cpp"></File><File path="wbfs_wbfs.h"></File></MagicFolder><File path="alternatedol.c"></File><File path="alternatedol.h"></File><File path="AlternateDOLOffsets.cpp"></File><File path="AlternateDOLOffsets.h"></File><File path="apploader.c"></File><File path="apploader.h"></File><File path="disc.c"></File><File path="disc.h"></File><File path="frag.c"></File><File path="frag.h"></File><File path="fstfile.c"></File><File path="fstfile.h"></File><File path="GameBooter.cpp"></File><File path="GameBooter.hpp"></File><File path="GameList.cpp"></File><File path="GameList.h"></File><File path="GetMissingGameFiles.cpp"></File><File path="GetMissingGameFiles.hpp"></File><File path="MountGamePartition.cpp"></File><File path="MountGamePartition.h"></File><File path="NandEmu.cpp"></File><File path="NandEmu.h"></File><File path="playlog.c"></File><File path="playlog.h"></File><File path="SavePath.cpp"></File><File path="SavePath.h"></File><File path="sdhc.c"></File><File path="sdhc.h"></File><File path="splits.c"></File><File path="splits.h"></File><File path="usbstorage2.c"></File><File path="usbstorage2.h"></File><File path="utils.c"></File><File path="utils.h"></File><File path="wbfs.cpp"></File><File path="wbfs.h"></File><File path="WDMFile.cpp"></File><File path="WDMFile.hpp"></File><File path="wdvd.c"></File><File path="wdvd.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="utils" path="utils\"><MagicFolder excludeFolders="CVS;.svn" filter="*" name="minizip" path="minizip\"><File path="miniunz.c"></File><File path="miniunz.h"></File></MagicFolder><File path="Callback.hpp"></File><File path="encrypt.c"></File><File path="encrypt.h"></File><File path="MD5.c"></File><File path="MD5.h"></File><File path="PasswordCheck.cpp"></File><File path="PasswordCheck.h"></File><File path="ResourceManager.cpp"></File><File path="ResourceManager.h"></File><File path="rockout.cpp"></File><File path="rockout.h"></File><File path="ShowError.cpp"></File><File path="ShowError.h"></File><File path="StringTools.c"></File><File path="StringTools.h"></File><File path="ThreadedTask.cpp"></File><File path="ThreadedTask.hpp"></File><File path="timer.c"></File><File path="timer.h"></File><File path="tools.h"></File><File path="uncompress.c"></File><File path="uncompress.h"></File><File path="wifi_gecko.c"></File><File path="wifi_gecko.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="wad" path="wad\"><File path="nandtitle.cpp"></File><File path="nandtitle.h"></File><File path="utils.h"></File><File path="wad.cpp"></File><File path="wad.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="xml" path="xml\"><File path="tinyxml.cpp"></File><File path="tinyxml.h"></File><File path="tinyxmlerror.cpp"></File><File path="tinyxmlparser.cpp"></File><File path="WiiTDB.cpp"></File><File path="WiiTDB.hpp"></File></MagicFolder><File path="audio.cpp"></File><File path="audio.h"></File><File path="FreeTypeGX.cpp"></File><File path="FreeTypeGX.h"></File><File path="gecko.c"></File><File path="gecko.h"></File><File path="input.cpp"></File><File path="input.h"></File><File path="lstub.cpp"></File><File path="lstub.h"></File><File path="main.cpp"></File><File path="main.h"></File><File path="menu.cpp"></File><File path="menu.h"></File><File path="StartUpProcess.cpp"></File><File path="StartUpProcess.h"></File><File path="svnrev.c"></File><File path="svnrev.h"></File><File path="sys.cpp"></File><File path="sys.h"></File><File path="video.cpp"></File><File path="video.h"></File><File path="wpad.c"></File><File path="wpad.h"></File><File path="wstring.cpp"></File><File path="wstring.hpp"></File><File path="ZipFile.cpp"></File><File path="ZipFile.h"></File></MagicFolder><File path="Makefile"></File></Project>
\ No newline at end of file
diff --git a/source/usbloader/NandEmu.cpp b/source/usbloader/NandEmu.cpp
index c12b5b07..667a4178 100644
--- a/source/usbloader/NandEmu.cpp
+++ b/source/usbloader/NandEmu.cpp
@@ -86,9 +86,6 @@ static s32 Nand_Mount(nandDevice *dev)
 
 static s32 Nand_Unmount(nandDevice *dev)
 {
-	if(!IosLoader::IsD2X())
-		return -1;
-
 	s32 fd, ret;
 
 	// Open FAT module
@@ -170,9 +167,6 @@ static s32 Nand_Disable(void)
 
 s32 Enable_Emu(int selection)
 {
-	if(!IosLoader::IsD2X())
-		return -1;
-
 	if(mounted != 0)
 		return -1;
 
@@ -200,9 +194,6 @@ s32 Enable_Emu(int selection)
 
 s32 Disable_Emu()
 {
-	if(!IosLoader::IsD2X())
-		return -1;
-
 	if(mounted==0)
 		return 0;