From 8f94b1dde85b8ee96db85a32a048888fd355ee9f Mon Sep 17 00:00:00 2001
From: giantpune <giantpune@gmail.com>
Date: Fri, 1 Oct 2010 00:26:16 +0000
Subject: [PATCH] * check pointer before checking strlen of it ( crash fix when
 selecting a channel to return to ) * enable alt-dol again.  still no
 auto-menu, but at least the games are playable

---
 HBC/META.XML                  | 4 ++--
 source/menu.cpp               | 8 ++++----
 source/menu/menu_disclist.cpp | 4 ++--
 source/settings/Settings.cpp  | 2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/HBC/META.XML b/HBC/META.XML
index 8cb72bdd..15d1aa14 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>1.0 r984</version>
-		<release_date>201009300423</release_date>
+		<version>1.0 r985</version>
+		<release_date>201009300633</release_date>
 		<short_description>Loads games from USB-devices</short_description>
 		<long_description>USB Loader GX is a libwiigui based USB iso loader with a wii-like GUI. You can install games to your HDDs and boot them with shorter loading times.
 The interactive GUI is completely controllable with WiiMote, Classic Controller or GC Controller.
diff --git a/source/menu.cpp b/source/menu.cpp
index 2984d048..56a69f99 100644
--- a/source/menu.cpp
+++ b/source/menu.cpp
@@ -409,7 +409,7 @@ int MainMenu(int menu)
         u8 iosChoice = Settings.cios;
         u8 fix002 = Settings.error002;
         u8 countrystrings = Settings.patchcountrystrings;
-		u8 alternatedol = off;
+	u8 alternatedol = off;
         u32 alternatedoloffset = 0;
         u8 reloadblock = off;
         u8 returnToLoaderGV = 1;
@@ -425,11 +425,11 @@ int MainMenu(int menu)
             fix002 = game_cfg->errorfix002;
             iosChoice = game_cfg->ios;
             countrystrings = game_cfg->patchcountrystrings;
-            if (!altdoldefault)
-            {
+	    //if (!altdoldefault)
+	    //{
                 alternatedol = game_cfg->loadalternatedol;
                 alternatedoloffset = game_cfg->alternatedolstart;
-            }
+	    //}
             reloadblock = game_cfg->iosreloadblock;
             returnToLoaderGV = game_cfg->returnTo;
         }
diff --git a/source/menu/menu_disclist.cpp b/source/menu/menu_disclist.cpp
index f8fa4274..6825cab8 100644
--- a/source/menu/menu_disclist.cpp
+++ b/source/menu/menu_disclist.cpp
@@ -1381,7 +1381,7 @@ int MenuDiscList()
 
             if (idBtn.GetState() == STATE_CLICKED && mountMethod != 3)
             {
-                gprintf("\n\tidBtn Clicked");
+		gprintf("\tidBtn Clicked\n");
                 struct discHdr * header = gameList[gameBrowser->GetSelectedOption()];
                 //enter new game ID
                 char entered[10];
@@ -1492,7 +1492,7 @@ int MenuDiscList()
 					GameStatistics.SetPlayCount(header->id, GameStatistics.GetPlayCount(header->id)+1);
 					GameStatistics.Save();
 
-                    gprintf("\n\tplaycount for %c%c%c%c%c%c raised to %i", header->id[0], header->id[1], header->id[2],
+		    gprintf("\tplaycount for %c%c%c%c%c%c raised to %i\n", header->id[0], header->id[1], header->id[2],
                             header->id[3], header->id[4], header->id[5],  GameStatistics.GetPlayCount(header->id));
 
                 }
diff --git a/source/settings/Settings.cpp b/source/settings/Settings.cpp
index 4b4aee37..50a2c2ff 100644
--- a/source/settings/Settings.cpp
+++ b/source/settings/Settings.cpp
@@ -1131,7 +1131,7 @@ int MenuSettings()
                                 if (haveTitle >= 0)
                                 {
                                     name = (char*) NandTitles.NameFromIndex(haveTitle);
-                                    if (!strlen(name)) name = NULL;
+				    if( name && !strlen(name) ) name = NULL;
                                 }
                                 options2.SetValue(Idx, "%s", name ? name : tr( opts_off_on[ 0 ] ));
                             }