From 08ce514727de63a1cf58114c0fbdb882cd2bb299 Mon Sep 17 00:00:00 2001
From: "lustar.mii" <lustar.mii@gmail.com>
Date: Sun, 18 Oct 2009 21:23:54 +0000
Subject: [PATCH] Added a macron in case any particular title happens to
 require it. The network init prompt won't show up at all when network has
 already been initialized. Ocarina should work for people that still had the
 problem with recent revisions (it fixed it for me, but only when using SD,
 not SDHC).

---
 gui.pnproj                          |   2 +-
 source/fatmounter.c                 |  10 ++----
 source/fatmounter.h                 |   1 -
 source/fonts/font.ttf               | Bin 48364 -> 55620 bytes
 source/menu.cpp                     |   5 ---
 source/prompts/PromptWindows.cpp    |  52 +++++++---------------------
 source/prompts/gameinfo.cpp         |  46 +++++++++++++-----------
 source/prompts/gameinfo.h           |   1 +
 source/settings/Settings.cpp        |  12 -------
 source/settings/SettingsPrompts.cpp |   3 --
 10 files changed, 42 insertions(+), 90 deletions(-)

diff --git a/gui.pnproj b/gui.pnproj
index 474de74a..a67b85a7 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="banner.c"></File><File path="banner.h"></File><File path="gui_banner.cpp"></File><File path="gui_banner.h"></File><File path="MD5.c"></File><File path="MD5.h"></File><File path="openingbnr.c"></File><File path="openingbnr.h"></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="fonts" path="fonts\"><File path="clock.ttf"></File><File path="font.ttf"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="homebrewboot" path="homebrewboot\"><File path="BootHomebrew.c"></File><File path="BootHomebrew.h"></File><File path="dolloader.c"></File><File path="dolloader.h"></File><File path="elfloader.c"></File><File path="elfloader.h"></File><File path="elf_abi.h"></File><File path="HomebrewBrowse.cpp"></File><File path="HomebrewBrowse.h"></File><File path="HomebrewFiles.cpp"></File><File path="HomebrewFiles.h"></File><File path="HomebrewXML.cpp"></File><File path="HomebrewXML.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="images" path="images\"><File path="abcIcon.png"></File><File path="addressbar_textbox.png"></File><File path="arrangeCarousel.png"></File><File path="arrangeGrid.png"></File><File path="arrangeList.png"></File><File path="arrow_next.png"></File><File path="arrow_previous.png"></File><File path="background.png"></File><File path="balanceboard.png"></File><File path="balanceboardR.png"></File><File path="battery.png"></File><File path="battery_bar.png"></File><File path="battery_bar_red.png"></File><File path="battery_bar_white.png"></File><File path="battery_red.png"></File><File path="battery_white.png"></File><File path="bg_browser.png"></File><File path="bg_browser_selection.png"></File><File path="bg_options.png"></File><File path="bg_options_entry.png"></File><File path="bg_options_settings.png"></File><File path="browser.png"></File><File path="browser_over.png"></File><File path="button_dialogue_box.png"></File><File path="button_install.png"></File><File path="button_install_over.png"></File><File path="cero_a.png"></File><File path="cero_b.png"></File><File path="cero_c.png"></File><File path="cero_d.png"></File><File path="cero_z.png"></File><File path="Channel_btn.png"></File><File path="classiccontroller.png"></File><File path="classiccontrollerR.png"></File><File path="closebutton.png"></File><File path="credits_bg.png"></File><File path="credits_button.png"></File><File path="credits_button_over.png"></File><File path="dancepad.png"></File><File path="dancepadR.png"></File><File path="dialogue_box.png"></File><File path="dialogue_box_install.png"></File><File path="dialogue_box_startgame.png"></File><File path="drums.png"></File><File path="drumsR.png"></File><File path="dvd.png"></File><File path="esrb_ao.png"></File><File path="esrb_e.png"></File><File path="esrb_ec.png"></File><File path="esrb_eten.png"></File><File path="esrb_m.png"></File><File path="esrb_t.png"></File><File path="exit_bottom.png"></File><File path="exit_bottom_over.png"></File><File path="exit_button.png"></File><File path="exit_top.png"></File><File path="exit_top_over.png"></File><File path="favIcon.png"></File><File path="favorite.png"></File><File path="gameinfo1.png"></File><File path="gameinfo1a.png"></File><File path="gameinfo2.png"></File><File path="gameinfo2a.png"></File><File path="gcncontroller.png"></File><File path="gcncontrollerR.png"></File><File path="guitar.png"></File><File path="guitarR.png"></File><File path="gxlogo.png"></File><File path="icon_folder.png"></File><File path="keyboard_backspace_over.png"></File><File path="keyboard_clear_over.png"></File><File path="keyboard_key.png"></File><File path="keyboard_key_over.png"></File><File path="keyboard_largekey_over.png"></File><File path="keyboard_mediumkey_over.png"></File><File path="keyboard_textbox.png"></File><File path="little_star.png"></File><File path="menu_button.png"></File><File path="menu_button_over.png"></File><File path="microphone.png"></File><File path="microphoneR.png"></File><File path="motionplus.png"></File><File path="motionplusR.png"></File><File path="mp3_pause.png"></File><File path="mp3_stop.png"></File><File path="nintendods.png"></File><File path="nintendodsR.png"></File><File path="nocover.png"></File><File path="nocoverFlat.png"></File><File path="nodisc.png"></File><File path="norating.png"></File><File path="not_favorite.png"></File><File path="nunchuk.png"></File><File path="nunchukR.png"></File><File path="pageindicator.png"></File><File path="pegi_12.png"></File><File path="pegi_16.png"></File><File path="pegi_18.png"></File><File path="pegi_3.png"></File><File path="pegi_7.png"></File><File path="playCountIcon.png"></File><File path="player1_point.png"></File><File path="player2_point.png"></File><File path="player3_point.png"></File><File path="player4_point.png"></File><File path="progressbar.png"></File><File path="progressbar_empty.png"></File><File path="progressbar_outline.png"></File><File path="rankIcon.png"></File><File path="rplayer1_point.png"></File><File path="rplayer2_point.png"></File><File path="rplayer3_point.png"></File><File path="rplayer4_point.png"></File><File path="scrollbar.png"></File><File path="scrollbar_arrowdown.png"></File><File path="scrollbar_arrowup.png"></File><File path="scrollbar_box.png"></File><File path="sdcard.png"></File><File path="sdcard_over.png"></File><File path="searchIcon.png"></File><File path="settings_background.png"></File><File path="settings_button.png"></File><File path="settings_button_over.png"></File><File path="settings_menu_button.png"></File><File path="settings_title.png"></File><File path="settings_title_over.png"></File><File path="startgame_arrow_left.png"></File><File path="startgame_arrow_right.png"></File><File path="tooltip_left.png"></File><File path="tooltip_right.png"></File><File path="tooltip_tile.png"></File><File path="usbport.png"></File><File path="wbackground.png"></File><File path="wdialogue_box_startgame.png"></File><File path="wheel.png"></File><File path="wheelR.png"></File><File path="wifi1.png"></File><File path="wifi12.png"></File><File path="wifi16.png"></File><File path="wifi2.png"></File><File path="wifi3.png"></File><File path="wifi32.png"></File><File path="wifi4.png"></File><File path="wifi8.png"></File><File path="Wifi_btn.png"></File><File path="wiimote.png"></File><File path="Wiimote1.png"></File><File path="Wiimote2.png"></File><File path="Wiimote3.png"></File><File path="Wiimote4.png"></File><File path="wiimote_poweroff.png"></File><File path="wiimote_poweroff_over.png"></File><File path="wiispeak.png"></File><File path="wiispeakR.png"></File><File path="zapper.png"></File><File path="zapperR.png"></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="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 excludeFolders="CVS;.svn" filter="*" name="libwiigui" path="libwiigui\"><File path="gui.h"></File><File path="gui_button.cpp"></File><File path="gui_customoptionbrowser.cpp"></File><File path="gui_customoptionbrowser.h"></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_gamebrowser.cpp"></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_image.cpp"></File><File path="gui_imagedata.cpp"></File><File path="gui_image_async.cpp"></File><File path="gui_image_async.h"></File><File path="gui_keyboard.cpp"></File><File path="gui_optionbrowser.cpp"></File><File path="gui_searchbar.cpp"></File><File path="gui_searchbar.h"></File><File path="gui_sound.cpp"></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></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="mload" path="mload\"><File path="dip_plugin.c"></File><File path="dip_plugin.h"></File><File path="ehcmodule.c"></File><File path="ehcmodule.h"></File><File path="mload.c"></File><File path="mload.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="network" path="network\"><File path="dns.c"></File><File path="dns.h"></File><File path="http.c"></File><File path="http.h"></File><File path="networkops.cpp"></File><File path="networkops.h"></File><File path="URL_List.cpp"></File><File path="URL_List.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="patches" path="patches\"><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="geckomenu.h"></File><File path="kenobiwii.h"></File><File path="patchcode.c"></File><File path="patchcode.h"></File><File path="patchhook.S"></File><File path="ppc.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="prompts" path="prompts\"><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="ProgressWindow.cpp"></File><File path="ProgressWindow.h"></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="ramdisc" path="ramdisc\"><File path="ramdisc.cpp"></File><File path="ramdisc.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="settings" path="settings\"><File path="cfg.c"></File><File path="cfg.h"></File><File path="Settings.cpp"></File><File path="Settings.h"></File><File path="SettingsPrompts.cpp"></File><File path="SettingsPrompts.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="sounds" path="sounds\"><File path="bg_music.ogg"></File><File path="button_click.pcm"></File><File path="button_click2.pcm"></File><File path="button_over.pcm"></File><File path="credits_music.ogg"></File><File path="menuin.ogg"></File><File path="menuout.ogg"></File><File path="success.ogg"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="unzip" path="unzip\"><File path="crypt.h"></File><File path="inflate.c"></File><File path="inflate.h"></File><File path="ioapi.c"></File><File path="ioapi.h"></File><File path="miniunz.c"></File><File path="miniunz.h"></File><File path="mztools.c"></File><File path="mztools.h"></File><File path="unzip.c"></File><File path="unzip.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="usbloader" path="usbloader\"><File path="alternatedol.c"></File><File path="alternatedol.h"></File><File path="apploader.c"></File><File path="apploader.h"></File><File path="disc.c"></File><File path="disc.h"></File><File path="fstfile.c"></File><File path="fstfile.h"></File><File path="getentries.cpp"></File><File path="getentries.h"></File><File path="partition.c"></File><File path="partition.h"></File><File path="sdhc.c"></File><File path="sdhc.h"></File><File path="usbstorage.c"></File><File path="usbstorage.h"></File><File path="utils.c"></File><File path="utils.h"></File><File path="wbfs.c"></File><File path="wbfs.h"></File><File path="wdvd.c"></File><File path="wdvd.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="wad" path="wad\"><File path="id.c"></File><File path="id.h"></File><File path="isfs.c"></File><File path="isfs.h"></File><File path="patchmii_core.c"></File><File path="patchmii_core.h"></File><File path="sha1.c"></File><File path="sha1.h"></File><File path="title.c"></File><File path="title.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="xml.c"></File><File path="xml.h"></File></MagicFolder><File path="audio.cpp"></File><File path="audio.h"></File><File path="data1"></File><File path="fatmounter.c"></File><File path="fatmounter.h"></File><File path="filelist.h"></File><File path="FreeTypeGX.cpp"></File><File path="FreeTypeGX.h"></File><File path="input.cpp"></File><File path="input.h"></File><File path="listfiles.c"></File><File path="listfiles.h"></File><File path="main.cpp"></File><File path="main.h"></File><File path="memory.h"></File><File path="menu.cpp"></File><File path="menu.h"></File><File path="Metaphrasis.cpp"></File><File path="Metaphrasis.h"></File><File path="oggplayer.c"></File><File path="oggplayer.h"></File><File path="stub.S"></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></MagicFolder></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="banner.c"></File><File path="banner.h"></File><File path="gui_banner.cpp"></File><File path="gui_banner.h"></File><File path="MD5.c"></File><File path="MD5.h"></File><File path="openingbnr.c"></File><File path="openingbnr.h"></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="fonts" path="fonts\"><File path="clock.ttf"></File><File path="font.ttf"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="homebrewboot" path="homebrewboot\"><File path="BootHomebrew.c"></File><File path="BootHomebrew.h"></File><File path="dolloader.c"></File><File path="dolloader.h"></File><File path="elfloader.c"></File><File path="elfloader.h"></File><File path="elf_abi.h"></File><File path="HomebrewBrowse.cpp"></File><File path="HomebrewBrowse.h"></File><File path="HomebrewFiles.cpp"></File><File path="HomebrewFiles.h"></File><File path="HomebrewXML.cpp"></File><File path="HomebrewXML.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="images" path="images\"><File path="abcIcon.png"></File><File path="addressbar_textbox.png"></File><File path="arrangeCarousel.png"></File><File path="arrangeGrid.png"></File><File path="arrangeList.png"></File><File path="arrow_next.png"></File><File path="arrow_previous.png"></File><File path="background.png"></File><File path="balanceboard.png"></File><File path="balanceboardR.png"></File><File path="battery.png"></File><File path="battery_bar.png"></File><File path="battery_bar_red.png"></File><File path="battery_bar_white.png"></File><File path="battery_red.png"></File><File path="battery_white.png"></File><File path="bg_browser.png"></File><File path="bg_browser_selection.png"></File><File path="bg_options.png"></File><File path="bg_options_entry.png"></File><File path="bg_options_settings.png"></File><File path="browser.png"></File><File path="browser_over.png"></File><File path="button_dialogue_box.png"></File><File path="button_install.png"></File><File path="button_install_over.png"></File><File path="cero_a.png"></File><File path="cero_b.png"></File><File path="cero_c.png"></File><File path="cero_d.png"></File><File path="cero_z.png"></File><File path="Channel_btn.png"></File><File path="classiccontroller.png"></File><File path="classiccontrollerR.png"></File><File path="closebutton.png"></File><File path="credits_bg.png"></File><File path="credits_button.png"></File><File path="credits_button_over.png"></File><File path="dancepad.png"></File><File path="dancepadR.png"></File><File path="dialogue_box.png"></File><File path="dialogue_box_install.png"></File><File path="dialogue_box_startgame.png"></File><File path="drums.png"></File><File path="drumsR.png"></File><File path="dvd.png"></File><File path="esrb_ao.png"></File><File path="esrb_e.png"></File><File path="esrb_ec.png"></File><File path="esrb_eten.png"></File><File path="esrb_m.png"></File><File path="esrb_t.png"></File><File path="exit_bottom.png"></File><File path="exit_bottom_over.png"></File><File path="exit_button.png"></File><File path="exit_top.png"></File><File path="exit_top_over.png"></File><File path="favIcon.png"></File><File path="favorite.png"></File><File path="gameinfo1.png"></File><File path="gameinfo1a.png"></File><File path="gameinfo2.png"></File><File path="gameinfo2a.png"></File><File path="gcncontroller.png"></File><File path="gcncontrollerR.png"></File><File path="guitar.png"></File><File path="guitarR.png"></File><File path="gxlogo.png"></File><File path="icon_archives.png"></File><File path="icon_default.png"></File><File path="icon_folder.png"></File><File path="icon_gfx.png"></File><File path="icon_pls.png"></File><File path="icon_sfx.png"></File><File path="icon_txt.png"></File><File path="icon_xml.png"></File><File path="keyboard_backspace_over.png"></File><File path="keyboard_clear_over.png"></File><File path="keyboard_key.png"></File><File path="keyboard_key_over.png"></File><File path="keyboard_largekey_over.png"></File><File path="keyboard_mediumkey_over.png"></File><File path="keyboard_textbox.png"></File><File path="little_star.png"></File><File path="menu_button.png"></File><File path="menu_button_over.png"></File><File path="microphone.png"></File><File path="microphoneR.png"></File><File path="motionplus.png"></File><File path="motionplusR.png"></File><File path="mp3_pause.png"></File><File path="mp3_stop.png"></File><File path="nintendods.png"></File><File path="nintendodsR.png"></File><File path="nocover.png"></File><File path="nocoverFlat.png"></File><File path="nodisc.png"></File><File path="norating.png"></File><File path="not_favorite.png"></File><File path="nunchuk.png"></File><File path="nunchukR.png"></File><File path="pageindicator.png"></File><File path="pegi_12.png"></File><File path="pegi_16.png"></File><File path="pegi_18.png"></File><File path="pegi_3.png"></File><File path="pegi_7.png"></File><File path="playCountIcon.png"></File><File path="player1_point.png"></File><File path="player2_point.png"></File><File path="player3_point.png"></File><File path="player4_point.png"></File><File path="progressbar.png"></File><File path="progressbar_empty.png"></File><File path="progressbar_outline.png"></File><File path="rankIcon.png"></File><File path="rplayer1_point.png"></File><File path="rplayer2_point.png"></File><File path="rplayer3_point.png"></File><File path="rplayer4_point.png"></File><File path="scrollbar.png"></File><File path="scrollbar_arrowdown.png"></File><File path="scrollbar_arrowup.png"></File><File path="scrollbar_box.png"></File><File path="sdcard.png"></File><File path="sdcard_over.png"></File><File path="searchIcon.png"></File><File path="settings_background.png"></File><File path="settings_button.png"></File><File path="settings_button_over.png"></File><File path="settings_menu_button.png"></File><File path="settings_title.png"></File><File path="settings_title_over.png"></File><File path="startgame_arrow_left.png"></File><File path="startgame_arrow_right.png"></File><File path="tooltip_left.png"></File><File path="tooltip_right.png"></File><File path="tooltip_tile.png"></File><File path="usbport.png"></File><File path="wbackground.png"></File><File path="wdialogue_box_startgame.png"></File><File path="wheel.png"></File><File path="wheelR.png"></File><File path="wifi1.png"></File><File path="wifi12.png"></File><File path="wifi16.png"></File><File path="wifi2.png"></File><File path="wifi3.png"></File><File path="wifi32.png"></File><File path="wifi4.png"></File><File path="wifi8.png"></File><File path="Wifi_btn.png"></File><File path="wiimote.png"></File><File path="Wiimote1.png"></File><File path="Wiimote2.png"></File><File path="Wiimote3.png"></File><File path="Wiimote4.png"></File><File path="wiimote_poweroff.png"></File><File path="wiimote_poweroff_over.png"></File><File path="wiispeak.png"></File><File path="wiispeakR.png"></File><File path="zapper.png"></File><File path="zapperR.png"></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="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 excludeFolders="CVS;.svn" filter="*" name="libwiigui" path="libwiigui\"><File path="gui.h"></File><File path="gui_button.cpp"></File><File path="gui_customoptionbrowser.cpp"></File><File path="gui_customoptionbrowser.h"></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_gamebrowser.cpp"></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_image.cpp"></File><File path="gui_imagedata.cpp"></File><File path="gui_image_async.cpp"></File><File path="gui_image_async.h"></File><File path="gui_keyboard.cpp"></File><File path="gui_optionbrowser.cpp"></File><File path="gui_searchbar.cpp"></File><File path="gui_searchbar.h"></File><File path="gui_sound.cpp"></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></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="mload" path="mload\"><File path="dip_plugin.c"></File><File path="dip_plugin.h"></File><File path="ehcmodule.c"></File><File path="ehcmodule.h"></File><File path="mload.c"></File><File path="mload.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="network" path="network\"><File path="dns.c"></File><File path="dns.h"></File><File path="http.c"></File><File path="http.h"></File><File path="networkops.cpp"></File><File path="networkops.h"></File><File path="URL_List.cpp"></File><File path="URL_List.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="patches" path="patches\"><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="geckomenu.h"></File><File path="kenobiwii.h"></File><File path="patchcode.c"></File><File path="patchcode.h"></File><File path="patchhook.S"></File><File path="ppc.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="prompts" path="prompts\"><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="ProgressWindow.cpp"></File><File path="ProgressWindow.h"></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="ramdisc" path="ramdisc\"><File path="ramdisc.cpp"></File><File path="ramdisc.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="settings" path="settings\"><File path="cfg.c"></File><File path="cfg.h"></File><File path="Settings.cpp"></File><File path="Settings.h"></File><File path="SettingsPrompts.cpp"></File><File path="SettingsPrompts.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="sounds" path="sounds\"><File path="bg_music.ogg"></File><File path="button_click.pcm"></File><File path="button_click2.pcm"></File><File path="button_over.pcm"></File><File path="credits_music.ogg"></File><File path="menuin.ogg"></File><File path="menuout.ogg"></File><File path="success.ogg"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="unzip" path="unzip\"><File path="crypt.h"></File><File path="inflate.c"></File><File path="inflate.h"></File><File path="ioapi.c"></File><File path="ioapi.h"></File><File path="miniunz.c"></File><File path="miniunz.h"></File><File path="mztools.c"></File><File path="mztools.h"></File><File path="unzip.c"></File><File path="unzip.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="usbloader" path="usbloader\"><File path="alternatedol.c"></File><File path="alternatedol.h"></File><File path="apploader.c"></File><File path="apploader.h"></File><File path="disc.c"></File><File path="disc.h"></File><File path="fstfile.c"></File><File path="fstfile.h"></File><File path="getentries.cpp"></File><File path="getentries.h"></File><File path="partition.c"></File><File path="partition.h"></File><File path="sdhc.c"></File><File path="sdhc.h"></File><File path="usbstorage.c"></File><File path="usbstorage.h"></File><File path="utils.c"></File><File path="utils.h"></File><File path="wbfs.c"></File><File path="wbfs.h"></File><File path="wdvd.c"></File><File path="wdvd.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="wad" path="wad\"><File path="id.c"></File><File path="id.h"></File><File path="isfs.c"></File><File path="isfs.h"></File><File path="patchmii_core.c"></File><File path="patchmii_core.h"></File><File path="sha1.c"></File><File path="sha1.h"></File><File path="title.c"></File><File path="title.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="xml.c"></File><File path="xml.h"></File></MagicFolder><File path="audio.cpp"></File><File path="audio.h"></File><File path="data1"></File><File path="fatmounter.c"></File><File path="fatmounter.h"></File><File path="filelist.h"></File><File path="FreeTypeGX.cpp"></File><File path="FreeTypeGX.h"></File><File path="input.cpp"></File><File path="input.h"></File><File path="listfiles.c"></File><File path="listfiles.h"></File><File path="main.cpp"></File><File path="main.h"></File><File path="memory.h"></File><File path="menu.cpp"></File><File path="menu.h"></File><File path="Metaphrasis.cpp"></File><File path="Metaphrasis.h"></File><File path="oggplayer.c"></File><File path="oggplayer.h"></File><File path="stub.S"></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></MagicFolder></Project>
\ No newline at end of file
diff --git a/source/fatmounter.c b/source/fatmounter.c
index 6c9a1ca2..a4e0b104 100644
--- a/source/fatmounter.c
+++ b/source/fatmounter.c
@@ -34,10 +34,6 @@ void USBDevice_deInit() {
     fatUnmount("USB:/");
 }
 
-int isSdInserted() {
-    return __io_sdhc.isInserted() || __io_wiisd.isInserted();
-}
-
 int isInserted(const char *path) {
     if (!strncmp(path, "USB:", 4))
         return 1;
@@ -48,10 +44,10 @@ int SDCard_Init() {
     //closing all open Files write back the cache and then shutdown em!
     fatUnmount("SD:/");
     //right now mounts first FAT-partition
-	if (fatMount("SD", &__io_sdhc, 0, CACHE, SDHC_SECTOR_SIZE))
+	if (fatMount("SD", &__io_wiisd, 0, CACHE, SECTORS))
+		return 1;
+	else if (fatMount("SD", &__io_sdhc, 0, CACHE, SDHC_SECTOR_SIZE))
 		return 1;
-    else if (fatMount("SD", &__io_wiisd, 0, CACHE, SECTORS))
-        return 1;
     return -1;
 }
 
diff --git a/source/fatmounter.h b/source/fatmounter.h
index e35faf41..b53c52a8 100644
--- a/source/fatmounter.h
+++ b/source/fatmounter.h
@@ -7,7 +7,6 @@ extern "C" {
 
     int USBDevice_Init();
     void USBDevice_deInit();
-    int isSdInserted();
     int isInserted(const char *path);
     int SDCard_Init();
     void SDCard_deInit();
diff --git a/source/fonts/font.ttf b/source/fonts/font.ttf
index d4c461ca284c77bb2f6ac20c9cb73dea322765ef..01ce58166c4c97ca7ed556833ac8ecd30a40823c 100644
GIT binary patch
delta 8439
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
G#{LV1A*h=G

delta 1376
zcmbVMZA?>V6h7znwtN|izyKGvb)zC11Q^y^3#Du8?FUdOg-Q?&SSb{>g{JKmHXS7y
zKQz;1+1-#tW7HVd8M7F!agHpGB}UyJwmHK{B+cRs8O$(#=)x8=c6up<?B{NB-us^C
zJm;MEocG*&dqVc)FD42I09$EcA<Ne6Z2d|5`(A*_EJD4u*1hK8_{YPfM*x^XXKO{(
z(TSl#030Lx!8X3J{piDRCxH9{$uHdjPw<<4cLxA6h5;1!yWfeZut=T;kgErPyxyQM
zpxAd#3y|%m7-63$91TJ~5Mh$+kmd8g+xswd*GUdUIPdT4@pzY(Z!8j-k^<L9fZ_}G
zb<)WW>b^i^@ba}CEa@u%vY3CM+tbyk3js__5jGR>3<jC!I8XaQ;;Z^Sfu3+xEhW27
z1;`qL1LklfHh!`m;LFEUVPP=T6a4dJob;S~<Peg&gJ}0I{21<1>YqWH>^H*UPKGXj
z{Vg2CZStknHUMD=x4p3_`7DxeN`fJ20O=H+DwYri-)D+Jj>5OthOAh?#AM=i#jo-%
z8JS7g<4LDN(&%Q0tY9dB6f1FEn;)dOYtQ<7vvu<x1#bHe@$J{D5M@HFD3C!X1|Ezc
z2Ubw2Ul6ovs}NQ15pJvB%;Cv)h{R74f%hmiC#G*djQ_*QhvN4o5kwHaF8vTew3nUs
zkz)CzRLMXU&Z3KnK_<LJ{oDVkYXkc%iJcjBi3_7;>90V}&Xl4GSE`9Q`yHK%>aM{1
zs9?@gm#Ec3*Tp<)ff%{CHHE@Ii<OG6etu0!+dppRi)mk-$`u!;l^ESQr`e*>Yd+H4
z()_c_zbno$TnT63+?<~q;l{Wt+?+O3Td8f)uIwJ&J*`vg9J&r&e|1y!)tdC0>Y9<7
z%lb^cTYpEtT)U;Vqc&zpH*^>-87AL4ZaifiH$FAxnc7W$)3E81Y05NjR+;VQA@ddU
ztvzl&n{Vgq+W8^=96!m&`DF`hDX?@}Zdl8$N37$vX4?tdoc)CTd0k80Tzy`BsQy9&
z-*B&C$zgC@bxb?v9e+2z+<3Fe?#y*^RO!?Y0U0ie<qsa9z|Is4nwewKO7H^uJ&}G$
zrI|x_OM?pX09IEMgGIwcEA10Q!}f+e-SDFSu+IZ3X)PHDdHbPU;;l7!ZMfFgM4Pif
z1tm}k2CzaCD2OJf-2n)~2#nDjS${5yF44b)a-l;SW5h#JZWg_Ggv6VS&q}Bao6wC-
zNlc!^>}cG;)_EE%L*svZtFQozH!wssWlZ(c!omQR*iMJYPCyb8BxFA&Kva+<esGCz
zNs&O{DIwCKlL!MV@QCmyn^+7yhH1j$8yLcj&^h}79uOYQx|A~d<Rfs57z{K+=f5z{
BCPn}N

diff --git a/source/menu.cpp b/source/menu.cpp
index 7b175588..f8eb4c6a 100644
--- a/source/menu.cpp
+++ b/source/menu.cpp
@@ -1062,7 +1062,6 @@ int MenuDiscList() {
                 startat = gameCarousel->GetSelectedOption();
                 offset = gameCarousel->GetOffset();
             }
-            //if(isSdInserted()) {
             if (isInserted(bootDevice)) {
 				HaltGui(); // to fix endless rumble when clicking on the SD icon when rumble is disabled because rumble is set to on in Global_Default()
 				CFG_Load();
@@ -1074,7 +1073,6 @@ int MenuDiscList() {
         }
 
         else if (DownloadBtn.GetState() == STATE_CLICKED) {
-            //if(isSdInserted()) {
             if (isInserted(bootDevice)) {
                 choice = WindowPrompt(tr("Cover Download"), 0, tr("Normal Covers"), tr("3D Covers"), tr("Disc Images"), tr("Back")); // ask for download choice
                 if (choice != 0) {
@@ -1133,7 +1131,6 @@ int MenuDiscList() {
 
         else if (favoriteBtn.GetState() == STATE_CLICKED) {
             Settings.fave=!Settings.fave;
-            //if(isSdInserted()) {
             if (isInserted(bootDevice)) {
                 cfg_save_global();
             }
@@ -1228,7 +1225,6 @@ int MenuDiscList() {
         else if (abcBtn.GetState() == STATE_CLICKED) {
             if (Settings.sort != all) {
                 Settings.sort=all;
-                //if(isSdInserted()) {
                 if (isInserted(bootDevice)) {
                     cfg_save_global();
                 }
@@ -1243,7 +1239,6 @@ int MenuDiscList() {
         else if (countBtn.GetState() == STATE_CLICKED) {
             if (Settings.sort != pcount) {
                 Settings.sort=pcount;
-                //if(isSdInserted()) {
                 if (isInserted(bootDevice)) {
                     cfg_save_global();
                 }
diff --git a/source/prompts/PromptWindows.cpp b/source/prompts/PromptWindows.cpp
index 254e7eb8..7fa8ffa5 100644
--- a/source/prompts/PromptWindows.cpp
+++ b/source/prompts/PromptWindows.cpp
@@ -18,6 +18,7 @@
 #include "network/networkops.h"
 #include "network/http.h"
 #include "prompts/PromptWindows.h"
+#include "prompts/gameinfo.h"
 #include "mload/mload.h"
 #include "fatmounter.h"
 #include "listfiles.h"
@@ -1380,7 +1381,6 @@ int GameWindowPrompt() {
                 promptWindow.SetEffect(EFFECT_SLIDE_TOP | EFFECT_SLIDE_OUT, 50);
             }
             else if (btnFavorite1.GetState() == STATE_CLICKED) {//switch favorite
-                //if(isSdInserted()) {
                 if (isInserted(bootDevice)) {
 					SetFavorite(&btnFavorite1, &btnFavorite2, &btnFavorite3, &btnFavorite4, &btnFavorite5, header->id, 1);
 					SetFavoriteImages(&btnFavoriteImg1, &btnFavoriteImg2, &btnFavoriteImg3, &btnFavoriteImg4, &btnFavoriteImg5, &imgFavorite, &imgNotFavorite);
@@ -1388,7 +1388,6 @@ int GameWindowPrompt() {
                 btnFavorite1.ResetState();
             }
             else if (btnFavorite2.GetState() == STATE_CLICKED) {//switch favorite
-                //if(isSdInserted()) {
                 if (isInserted(bootDevice)) {
 					SetFavorite(&btnFavorite1, &btnFavorite2, &btnFavorite3, &btnFavorite4, &btnFavorite5, header->id, 2);
 					SetFavoriteImages(&btnFavoriteImg1, &btnFavoriteImg2, &btnFavoriteImg3, &btnFavoriteImg4, &btnFavoriteImg5, &imgFavorite, &imgNotFavorite);
@@ -1396,7 +1395,6 @@ int GameWindowPrompt() {
                 btnFavorite2.ResetState();
             }
             else if (btnFavorite3.GetState() == STATE_CLICKED) {//switch favorite
-                //if(isSdInserted()) {
                 if (isInserted(bootDevice)) {
 					SetFavorite(&btnFavorite1, &btnFavorite2, &btnFavorite3, &btnFavorite4, &btnFavorite5, header->id, 3);
 					SetFavoriteImages(&btnFavoriteImg1, &btnFavoriteImg2, &btnFavoriteImg3, &btnFavoriteImg4, &btnFavoriteImg5, &imgFavorite, &imgNotFavorite);
@@ -1404,7 +1402,6 @@ int GameWindowPrompt() {
                 btnFavorite3.ResetState();
             }
             else if (btnFavorite4.GetState() == STATE_CLICKED) {//switch favorite
-                //if(isSdInserted()) {
                 if (isInserted(bootDevice)) {
 					SetFavorite(&btnFavorite1, &btnFavorite2, &btnFavorite3, &btnFavorite4, &btnFavorite5, header->id, 4);
 					SetFavoriteImages(&btnFavoriteImg1, &btnFavoriteImg2, &btnFavoriteImg3, &btnFavoriteImg4, &btnFavoriteImg5, &imgFavorite, &imgNotFavorite);
@@ -1412,7 +1409,6 @@ int GameWindowPrompt() {
                 btnFavorite4.ResetState();
             }
             else if (btnFavorite5.GetState() == STATE_CLICKED) {//switch favorite
-                //if(isSdInserted()) {
                 if (isInserted(bootDevice)) {
 					SetFavorite(&btnFavorite1, &btnFavorite2, &btnFavorite3, &btnFavorite4, &btnFavorite5, header->id, 5);
 					SetFavoriteImages(&btnFavoriteImg1, &btnFavoriteImg2, &btnFavoriteImg3, &btnFavoriteImg4, &btnFavoriteImg5, &imgFavorite, &imgNotFavorite);
@@ -1823,7 +1819,7 @@ bool SearchMissingImages(int choice2) {
 	__Menu_GetEntries();
     ResumeGui();
 
-	if (cntMissFiles > 0) { //&& !IsNetworkInit()) {
+	if (cntMissFiles > 0) {
 		NetworkInitPrompt();
 	}
 
@@ -1837,6 +1833,10 @@ bool SearchMissingImages(int choice2) {
  * NetworkInitPrompt
  ***************************************************************************/
 bool NetworkInitPrompt() {
+
+	if (IsNetworkInit())
+		return true;
+
     bool success = true;
 
     GuiWindow promptWindow(472,320);
@@ -2548,23 +2548,9 @@ int ProgressUpdateWindow() {
     }
 
     //make the URL to get XML based on our games
-    char XMLurl[3540]; // NET_BUFFER_SIZE in http.c needs to be set to size of XMLurl + 40
-    char filename[10];
-    __Menu_GetEntries(1);
-    snprintf(XMLurl,sizeof(XMLurl),"http://wiitdb.com/wiitdb.zip?LANG=%s&ID=",Settings.db_language);
-    unsigned int i;
-    for (i = 0; i < gameCnt ; i++) {
-        struct discHdr* header = &gameList[i];
-        if (i<500) {
-            //snprintf(filename,sizeof(filename),"%c%c%c", header->id[1], header->id[2], header->id[3]);
-            //strncat(XMLurl,filename,3);
-            snprintf(filename,sizeof(filename),"%c%c%c%c%c%c", header->id[0], header->id[1], header->id[2],header->id[3], header->id[4], header->id[5]);
-            strncat(XMLurl,filename,6);
-            if ((i!=gameCnt-1)&&(i<500))
-                strncat(XMLurl, ",",1);
-        }
-    }
-    __Menu_GetEntries();
+	char XMLurl[3540];
+	build_XML_URL(XMLurl,sizeof(XMLurl));
+	
     if (IsNetworkInit() && ret >= 0) {
 
         updatemode = WindowPrompt(tr("What do you want to update?"), 0, "USBLoader GX", tr("WiiTDB Files"), tr("Languagefile"), tr("Cancel"));
@@ -2868,23 +2854,9 @@ int ProgressUpdateWindow() {
     }
 
     //make the URL to get XML based on our games
-    char XMLurl[3540];
-    char filename[10];
-    __Menu_GetEntries(1);
-    snprintf(XMLurl,sizeof(XMLurl),"http://wiitdb.com/wiitdb.zip?LANG=%s&ID=",Settings.db_language);
-    unsigned int i;
-    for (i = 0; i < gameCnt ; i++) {
-        struct discHdr* header = &gameList[i];
-        if (i<500) {
-            //snprintf(filename,sizeof(filename),"%c%c%c", header->id[1], header->id[2], header->id[3]);
-            //strncat(XMLurl, filename,3 );
-			snprintf(filename,sizeof(filename),"%c%c%c%c%c%c", header->id[0], header->id[1], header->id[2],header->id[3], header->id[4], header->id[5]);
-            strncat(XMLurl,filename,6);
-            if ((i!=gameCnt-1)&&(i<500))
-                strncat(XMLurl, ",",1);
-        }
-    }
-    __Menu_GetEntries();
+	char XMLurl[3540];
+	build_XML_URL(XMLurl,sizeof(XMLurl));
+	
     char dolpath[150];
 //    char dolpathsuccess[150];//use coverspath as a folder for the update wad so we dont make a new folder and have to delete it
     snprintf(dolpath, sizeof(dolpath), "%sULNR.wad", Settings.covers_path);
diff --git a/source/prompts/gameinfo.cpp b/source/prompts/gameinfo.cpp
index 2f5230c7..3a1c416e 100644
--- a/source/prompts/gameinfo.cpp
+++ b/source/prompts/gameinfo.cpp
@@ -1086,26 +1086,10 @@ bool save_XML_URL() { // save xml url as as txt file for people without wifi
         sleep(1);
         return false;
     }
-    //make sure that all games are added to the gamelist
-    __Menu_GetEntries(1);
-
-    char XMLurl[3540];
-    char filename[10];
-
-    snprintf(XMLurl,sizeof(XMLurl),"http://wiitdb.com/wiitdb.zip?LANG=%s&ID=", Settings.db_language);
-    unsigned int i;
-    for (i = 0; i < gameCnt ; i++) {
-        struct discHdr* header = &gameList[i];
-        if (i<500) {
-            //snprintf(filename,sizeof(filename),"%c%c%c", header->id[1], header->id[2], header->id[3]);
-            //strncat(XMLurl, filename,3 );
-			snprintf(filename,sizeof(filename),"%c%c%c%c%c%c", header->id[0], header->id[1], header->id[2],header->id[3], header->id[4], header->id[5]);
-            strncat(XMLurl,filename,6);
-            if ((i!=gameCnt-1)&&(i<500))
-                strncat(XMLurl, ",",1);
-        }
-    }
-
+	
+	char XMLurl[3540];
+	build_XML_URL(XMLurl,sizeof(XMLurl));
+	
     fprintf(f, "# USB Loader Has Saved this file\n");
     fprintf(f, "# This URL was created based on your list of games and language settings.\n");
     fclose(f);
@@ -1118,7 +1102,6 @@ bool save_XML_URL() { // save xml url as as txt file for people without wifi
 
     fclose(f);
 
-    __Menu_GetEntries();
     return true;
 }
 
@@ -1129,3 +1112,24 @@ void MemInfoPrompt()
     strlcpy(meminfotxt,MemInfo(),sizeof(meminfotxt));
 	WindowPrompt(0,meminfotxt, tr("OK"));
 }
+
+
+void build_XML_URL(char *XMLurl, int XMLurlsize) {
+    __Menu_GetEntries(1);
+	// NET_BUFFER_SIZE in http.c needs to be set to size of XMLurl + 40
+    char url[3540];
+    char filename[10];
+    snprintf(url,sizeof(url),"http://wiitdb.com/wiitdb.zip?LANG=%s&ID=", Settings.db_language);
+    unsigned int i;
+    for (i = 0; i < gameCnt ; i++) {
+        struct discHdr* header = &gameList[i];
+        if (i<500) {
+			snprintf(filename,sizeof(filename),"%c%c%c%c%c%c", header->id[0], header->id[1], header->id[2],header->id[3], header->id[4], header->id[5]);
+            strncat(url,filename,6);
+            if ((i!=gameCnt-1)&&(i<500))
+                strncat(url, ",",1);
+        }
+    }
+	strlcpy(XMLurl,url,XMLurlsize);
+	__Menu_GetEntries();
+}
diff --git a/source/prompts/gameinfo.h b/source/prompts/gameinfo.h
index c8bc701e..4f46670b 100644
--- a/source/prompts/gameinfo.h
+++ b/source/prompts/gameinfo.h
@@ -9,6 +9,7 @@
 #define _GAMEINFO_H_
 
 int showGameInfo(char *ID);
+void build_XML_URL(char *XMLurl, int XMLurlsize);
 bool save_XML_URL();
 bool save_gamelist(int txt);
 void MemInfoPrompt();
diff --git a/source/settings/Settings.cpp b/source/settings/Settings.cpp
index 6c19a1a1..6fcd66cd 100644
--- a/source/settings/Settings.cpp
+++ b/source/settings/Settings.cpp
@@ -551,7 +551,6 @@ int MenuSettings() {
                             switch (ret)
                             {
                                 case 0:
-                                    //if(isSdInserted()) {
                                     if (isInserted(bootDevice)) {
                                         if ( Settings.godmode == 1) {
                                             w.SetEffect(EFFECT_FADE, -20);
@@ -1130,7 +1129,6 @@ int MenuSettings() {
                             switch (ret)
                             {
                                 case 0:
-                                    //if(isSdInserted())
                                     if (isInserted(bootDevice)) {
                                         w.SetEffect(EFFECT_FADE, -20);
                                         while (w.GetEffect()>0) usleep(50);
@@ -1293,7 +1291,6 @@ int MenuSettings() {
                                                 strncat (entered, "/", 1);
                                             strlcpy(Settings.covers_path, entered, sizeof(Settings.covers_path));
                                             WindowPrompt(tr("Cover Path Changed"),0,tr("OK"));
-    //                                        if(!isSdInserted()) {
                                             if (!isInserted(bootDevice)) {
                                                 WindowPrompt(tr("No SD-Card inserted!"), tr("Insert an SD-Card to save."), tr("OK"));
                                             }
@@ -1319,7 +1316,6 @@ int MenuSettings() {
                                                 strncat (entered, "/", 1);
                                             strlcpy(Settings.covers2d_path, entered, sizeof(Settings.covers2d_path));
                                             WindowPrompt(tr("Cover Path Changed"),0,tr("OK"));
-    //                                        if(!isSdInserted()) {
                                             if (!isInserted(bootDevice)) {
                                                 WindowPrompt(tr("No SD-Card inserted!"), tr("Insert an SD-Card to save."), tr("OK"));
                                             }
@@ -1345,7 +1341,6 @@ int MenuSettings() {
                                                 strncat (entered, "/", 1);
                                             strlcpy(Settings.disc_path, entered, sizeof(Settings.disc_path));
                                             WindowPrompt(tr("Disc Path Changed"),0,tr("OK"));
-    //                                        if(!isSdInserted()) {
                                             if (!isInserted(bootDevice)) {
                                                 WindowPrompt(tr("No SD-Card inserted!"), tr("Insert an SD-Card to save."), tr("OK"));
                                             }
@@ -1370,7 +1365,6 @@ int MenuSettings() {
                                                 strncat (entered, "/", 1);
                                             strlcpy(CFG.theme_path, entered, sizeof(CFG.theme_path));
                                             WindowPrompt(tr("Theme Path Changed"),0,tr("OK"));
-    //                                        if(!isSdInserted()) {
                                             if (!isInserted(bootDevice)) {
                                                 WindowPrompt(tr("No SD-Card inserted!"), tr("Insert an SD-Card to save."), tr("OK"));
                                             } else {
@@ -1430,7 +1424,6 @@ int MenuSettings() {
                                                 strncat (entered, "/", 1);
                                             strlcpy(Settings.titlestxt_path, entered, sizeof(Settings.titlestxt_path));
                                             WindowPrompt(tr("WiiTDB Path changed."),0,tr("OK"));
-    //                                        if(isSdInserted()) {
                                             if (isInserted(bootDevice)) {
                                                 cfg_save_global();
                                                 HaltGui();
@@ -1524,7 +1517,6 @@ int MenuSettings() {
                                                 strncat (entered, "/", 1);
                                             strlcpy(Settings.dolpath, entered, sizeof(Settings.dolpath));
                                             WindowPrompt(tr("DOL path changed"),0,tr("OK"));
-    //                                        if(!isSdInserted()) {
                                             if (!isInserted(bootDevice)) {
                                                 WindowPrompt(tr("No SD-Card inserted!"), tr("Insert an SD-Card to save."), tr("OK"));
                                             }
@@ -1550,7 +1542,6 @@ int MenuSettings() {
                                                 strncat (entered, "/", 1);
                                             strlcpy(Settings.homebrewapps_path, entered, sizeof(Settings.homebrewapps_path));
                                             WindowPrompt(tr("Homebrew Appspath changed"),0,tr("OK"));
-    //                                        if(!isSdInserted()) {
                                             if (!isInserted(bootDevice)) {
                                                 WindowPrompt(tr("No SD-Card inserted!"), tr("Insert an SD-Card to save."), tr("OK"));
                                             }
@@ -1601,7 +1592,6 @@ int MenuSettings() {
                     w.Remove(&MainButton2);
                     w.Remove(&MainButton3);
                     w.Remove(&MainButton4);
-//                    if(isSdInserted() && Settings.godmode) {
                     if (isInserted(bootDevice) && Settings.godmode) {
                         w.Remove(&optionBrowser2);
                         w.Remove(&backBtn);
@@ -1639,7 +1629,6 @@ int MenuSettings() {
                     if (Settings.godmode) {
                         int choice = WindowPrompt(tr("Are you sure?"), 0, tr("Yes"), tr("Cancel"));
                         if (choice == 1) {
-//							if(isSdInserted())
                             if (isInserted(bootDevice)) {
                                 char GXGlobal_cfg[26];
                                 sprintf(GXGlobal_cfg, "%s/config/GXGlobal.cfg", bootDevice);
@@ -1692,7 +1681,6 @@ int MenuSettings() {
 
             else if (backBtn.GetState() == STATE_CLICKED) {
                 //Add the procedure call to save the global configuration
-//				if(isSdInserted()) {
                 if (isInserted(bootDevice)) {
                     cfg_save_global();
                 }
diff --git a/source/settings/SettingsPrompts.cpp b/source/settings/SettingsPrompts.cpp
index e30266ad..5590bd70 100644
--- a/source/settings/SettingsPrompts.cpp
+++ b/source/settings/SettingsPrompts.cpp
@@ -232,7 +232,6 @@ bool MenuOGG() {
                     strncat (entered, "/", 1);
                 strlcpy(Settings.oggload_path, entered, sizeof(Settings.oggload_path));
                 WindowPrompt(tr("Backgroundmusic Path changed."),0,tr("OK"));
-//                if(isSdInserted()) {
                 if (isInserted(bootDevice)) {
                     if (!strcmp("", Settings.oggload_path)) {
                         sprintf(Settings.ogg_path, "notset");
@@ -549,7 +548,6 @@ int MenuLanguageSelect() {
                     strncat (entered, "/", 1);
                 strlcpy(Settings.languagefiles_path, entered, sizeof(Settings.languagefiles_path));
                 WindowPrompt(tr("Languagepath changed."),0,tr("OK"));
-//                if(isSdInserted()) {
                 if (isInserted(bootDevice)) {
                     cfg_save_global();
                     returnhere = 1;
@@ -569,7 +567,6 @@ int MenuLanguageSelect() {
         if (ret>=0) {
             choice = WindowPrompt(tr("Do you want to change language?"), 0, tr("Yes"), tr("Cancel"));
             if (choice == 1) {
-//        if(isSdInserted()) {
                 if (isInserted(bootDevice)) {
                     snprintf(Settings.language_path, sizeof(Settings.language_path), "%s%s", Settings.languagefiles_path, GetFileName(ret));
                     cfg_save_global();