From 644e96b2d9b16d4ecfd270d739430de42a3427f2 Mon Sep 17 00:00:00 2001
From: Cyan <cyan06@users.noreply.github.com>
Date: Sat, 14 Feb 2015 15:41:20 +0000
Subject: [PATCH] * Changed partition detection for DIOS MIOS to allow logical 
  partition located before primary partition. (Thanks RCJayce) * Changed
 partition detection for Nintendont to allow logical   and primary partitions
 before the first FAT32 partition.   (ex. NTFS primary+FAT32 primary) * Moved
 IsWiiU() function to sys.c

* Fixed French language file
---
 HBC/META.XML                                  |  4 +-
 Languages/czech.lang                          |  6 +-
 Languages/danish.lang                         |  6 +-
 Languages/dutch.lang                          | 16 +++--
 Languages/english.lang                        |  6 +-
 Languages/finnish.lang                        |  6 +-
 Languages/french.lang                         | 22 ++++---
 Languages/german.lang                         | 16 +++--
 Languages/greek.lang                          |  6 +-
 Languages/hungarian.lang                      |  6 +-
 Languages/italian.lang                        |  6 +-
 Languages/japanese.lang                       |  6 +-
 Languages/korean.lang                         |  6 +-
 Languages/norwegian.lang                      |  6 +-
 Languages/polish.lang                         |  6 +-
 Languages/portuguese_br.lang                  | 16 +++--
 Languages/portuguese_pt.lang                  |  6 +-
 Languages/russian.lang                        |  6 +-
 Languages/schinese.lang                       | 16 +++--
 Languages/spanish.lang                        | 17 +++--
 Languages/swedish.lang                        |  6 +-
 Languages/tchinese.lang                       |  6 +-
 Languages/thai.lang                           |  6 +-
 Languages/turkish.lang                        |  6 +-
 source/settings/menus/FeatureSettingsMenu.cpp |  3 +-
 source/sys.cpp                                |  9 +++
 source/sys.h                                  |  3 +-
 source/system/IosLoader.cpp                   | 10 +--
 source/system/IosLoader.h                     |  1 -
 source/usbloader/GameBooter.cpp               | 65 ++++++++++++-------
 source/video.cpp                              |  3 +-
 31 files changed, 179 insertions(+), 124 deletions(-)

diff --git a/HBC/META.XML b/HBC/META.XML
index 650f3206..fe29d92a 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 r1238</version>
-		<release_date>20150119224319</release_date>
+		<version>3.0 r1241</version>
+		<release_date>20150214152922</release_date>
 		<!--   // remove this line to enable arguments
 		<arguments>
 				<arg>--ios=250</arg>
diff --git a/Languages/czech.lang b/Languages/czech.lang
index ee3dc3e4..11a5718d 100644
--- a/Languages/czech.lang
+++ b/Languages/czech.lang
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-04 21:00+0100\n"
+"POT-Creation-Date: 2015-02-14 16:29+0100\n"
 "PO-Revision-Date: 2009-10-01 01:00+0200\n"
 "Last-Translator: David Jelinek (djelinek@hotmail.com) e->e,r->r,u->u, c->c \n"
 "Language-Team: r1056 - last version on http://djelinek.sweb.cz/_USBLoderGX/czech.lang \n"
@@ -2044,11 +2044,11 @@ msgid "To run GameCube games with %s you need to place them on an USB FAT32 part
 msgstr ""
 
 #, c-format
-msgid "To run GameCube games with %s you need to set your 'Main GameCube Path' on a primary partition."
+msgid "To run GameCube games with %s you need to set your 'Main GameCube Path' on the first primary FAT32 partition."
 msgstr ""
 
 #, c-format
-msgid "To run GameCube games with %s you need to set your 'Main GameCube Path' on the first partition of the Hard Drive."
+msgid "To run GameCube games with %s you need to set your 'Main GameCube Path' on the first primary partition of the Hard Drive."
 msgstr ""
 
 #, c-format
diff --git a/Languages/danish.lang b/Languages/danish.lang
index a333463f..b58f73aa 100644
--- a/Languages/danish.lang
+++ b/Languages/danish.lang
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-04 21:00+0100\n"
+"POT-Creation-Date: 2015-02-14 16:29+0100\n"
 "PO-Revision-Date: 2009-10-01 01:00+0200\n"
 "Last-Translator: Fox888[dk]\n"
 "Language-Team: [dk]\n"
@@ -2044,11 +2044,11 @@ msgid "To run GameCube games with %s you need to place them on an USB FAT32 part
 msgstr ""
 
 #, c-format
-msgid "To run GameCube games with %s you need to set your 'Main GameCube Path' on a primary partition."
+msgid "To run GameCube games with %s you need to set your 'Main GameCube Path' on the first primary FAT32 partition."
 msgstr ""
 
 #, c-format
-msgid "To run GameCube games with %s you need to set your 'Main GameCube Path' on the first partition of the Hard Drive."
+msgid "To run GameCube games with %s you need to set your 'Main GameCube Path' on the first primary partition of the Hard Drive."
 msgstr ""
 
 #, c-format
diff --git a/Languages/dutch.lang b/Languages/dutch.lang
index f9ebdb54..09b6ea54 100644
--- a/Languages/dutch.lang
+++ b/Languages/dutch.lang
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-04 21:00+0100\n"
+"POT-Creation-Date: 2015-02-14 16:29+0100\n"
 "PO-Revision-Date: 2009-10-01 01:00+0200\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -2044,12 +2044,12 @@ msgid "To run GameCube games with %s you need to place them on an USB FAT32 part
 msgstr "Om GameCube games met %s te spelen moet je ze op een USB FAT32 partitie plaatsen."
 
 #, c-format
-msgid "To run GameCube games with %s you need to set your 'Main GameCube Path' on a primary partition."
-msgstr "Om GameCube spellen met %s te spelen moet je je 'Hoofd GameCube Pad' op een primary partitie zetten."
+msgid "To run GameCube games with %s you need to set your 'Main GameCube Path' on the first primary FAT32 partition."
+msgstr ""
 
 #, c-format
-msgid "To run GameCube games with %s you need to set your 'Main GameCube Path' on the first partition of the Hard Drive."
-msgstr "Om GameCube spellen met %s te spelen moet je je 'Hoofd GameCube Pad' op de eerste partitie van de hardeschijf zetten."
+msgid "To run GameCube games with %s you need to set your 'Main GameCube Path' on the first primary partition of the Hard Drive."
+msgstr ""
 
 #, c-format
 msgid "To run GameCube games with %s you need to set your 'Main GameCube Path' to an USB FAT32 partition."
@@ -2367,6 +2367,12 @@ msgstr "van"
 msgid "seconds left"
 msgstr "seconde resterend"
 
+#~ msgid "To run GameCube games with %s you need to set your 'Main GameCube Path' on a primary partition."
+#~ msgstr "Om GameCube spellen met %s te spelen moet je je 'Hoofd GameCube Pad' op een primary partitie zetten."
+
+#~ msgid "To run GameCube games with %s you need to set your 'Main GameCube Path' on the first partition of the Hard Drive."
+#~ msgstr "Om GameCube spellen met %s te spelen moet je je 'Hoofd GameCube Pad' op de eerste partitie van de hardeschijf zetten."
+
 #~ msgid "Error 002 fix"
 #~ msgstr "Herstel fout 002"
 
diff --git a/Languages/english.lang b/Languages/english.lang
index 4084aae6..489f924b 100644
--- a/Languages/english.lang
+++ b/Languages/english.lang
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-04 21:00+0100\n"
+"POT-Creation-Date: 2015-02-14 16:29+0100\n"
 "PO-Revision-Date: 2009-10-01 01:00+0200\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -2044,11 +2044,11 @@ msgid "To run GameCube games with %s you need to place them on an USB FAT32 part
 msgstr ""
 
 #, c-format
-msgid "To run GameCube games with %s you need to set your 'Main GameCube Path' on a primary partition."
+msgid "To run GameCube games with %s you need to set your 'Main GameCube Path' on the first primary FAT32 partition."
 msgstr ""
 
 #, c-format
-msgid "To run GameCube games with %s you need to set your 'Main GameCube Path' on the first partition of the Hard Drive."
+msgid "To run GameCube games with %s you need to set your 'Main GameCube Path' on the first primary partition of the Hard Drive."
 msgstr ""
 
 #, c-format
diff --git a/Languages/finnish.lang b/Languages/finnish.lang
index 68f05739..5439c86c 100644
--- a/Languages/finnish.lang
+++ b/Languages/finnish.lang
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-04 21:00+0100\n"
+"POT-Creation-Date: 2015-02-14 16:29+0100\n"
 "PO-Revision-Date: 2009-10-01 01:00+0200\n"
 "Last-Translator: c64rmx\n"
 "Language-Team: \n"
@@ -2044,11 +2044,11 @@ msgid "To run GameCube games with %s you need to place them on an USB FAT32 part
 msgstr ""
 
 #, c-format
-msgid "To run GameCube games with %s you need to set your 'Main GameCube Path' on a primary partition."
+msgid "To run GameCube games with %s you need to set your 'Main GameCube Path' on the first primary FAT32 partition."
 msgstr ""
 
 #, c-format
-msgid "To run GameCube games with %s you need to set your 'Main GameCube Path' on the first partition of the Hard Drive."
+msgid "To run GameCube games with %s you need to set your 'Main GameCube Path' on the first primary partition of the Hard Drive."
 msgstr ""
 
 #, c-format
diff --git a/Languages/french.lang b/Languages/french.lang
index 6f0c5730..d277f8eb 100644
--- a/Languages/french.lang
+++ b/Languages/french.lang
@@ -1,11 +1,11 @@
 # USB Loader GX language source file.
-# French.lang - r1235
+# French.lang - r1241
 # don't delete/change this line (é).
 msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-04 21:00+0100\n"
+"POT-Creation-Date: 2015-02-14 16:29+0100\n"
 "PO-Revision-Date: 2009-10-01 01:00+0200\n"
 "Last-Translator: Cyan\n"
 "Language-Team: Badablek, Amour, ikya, Cyan & Kin8\n"
@@ -2044,20 +2044,20 @@ msgid "To run GameCube games with %s you need to place them on an USB FAT32 part
 msgstr "Pour lancer les jeux GameCube avec %s vous devez les copier sur une partition USB FAT32."
 
 #, c-format
-msgid "To run GameCube games with %s you need to set your 'Main GameCube Path' on a primary partition."
-msgstr "Pour lancer les jeux GameCube avec %s vouz devez placer votre 'Dossier GameCube principal' sur une partition principale."
+msgid "To run GameCube games with %s you need to set your 'Main GameCube Path' on the first primary FAT32 partition."
+msgstr "Pour lancer les jeux GameCube avec %s vouz devez placer votre 'Dossier GameCube principal' sur la premiere partition principale FAT32."
 
 #, c-format
-msgid "To run GameCube games with %s you need to set your 'Main GameCube Path' on the first partition of the Hard Drive."
-msgstr "Pour lancer les jeux GameCube avec %s vouz devez placer votre 'Dossier GameCube principal' sur la 1ère partition du disque dur."
+msgid "To run GameCube games with %s you need to set your 'Main GameCube Path' on the first primary partition of the Hard Drive."
+msgstr "Pour lancer les jeux GameCube avec %s vous devez placer votre 'Dossier GameCube principal' sur la 1ère partition principale du disque dur."
 
 #, c-format
 msgid "To run GameCube games with %s you need to set your 'Main GameCube Path' to an USB FAT32 partition."
-msgstr "Pour lancer les jeux GameCube avec %s vouz devez placer votre 'Dossier GameCube principal' sur une partition USB FAT32."
+msgstr "Pour lancer les jeux GameCube avec %s vous devez placer votre 'Dossier GameCube principal' sur une partition USB FAT32."
 
 #, c-format
 msgid "To run GameCube games with %s you need to use a 512 bytes/sector Hard Drive."
-msgstr "Pour lancer les jeux GameCube avec %s vouz devez utiliser un disque dur avec 512 octets par secteur."
+msgstr "Pour lancer les jeux GameCube avec %s vous devez utiliser un disque dur avec 512 octets par secteur."
 
 #, c-format
 msgid "To run GameCube games with %s you need to use a partition with 32k bytes/cluster or less."
@@ -2367,6 +2367,12 @@ msgstr "sur"
 msgid "seconds left"
 msgstr "secondes restantes"
 
+#~ msgid "To run GameCube games with %s you need to set your 'Main GameCube Path' on a primary partition."
+#~ msgstr "Pour lancer les jeux GameCube avec %s vouz devez placer votre 'Dossier GameCube principal' sur une partition principale."
+
+#~ msgid "To run GameCube games with %s you need to set your 'Main GameCube Path' on the first partition of the Hard Drive."
+#~ msgstr "Pour lancer les jeux GameCube avec %s vouz devez placer votre 'Dossier GameCube principal' sur la 1ère partition du disque dur."
+
 #~ msgid "Error 002 fix"
 #~ msgstr "Correctif Erreur 002"
 
diff --git a/Languages/german.lang b/Languages/german.lang
index 36747e1c..1f2cd9c9 100644
--- a/Languages/german.lang
+++ b/Languages/german.lang
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-04 21:00+0100\n"
+"POT-Creation-Date: 2015-02-14 16:29+0100\n"
 "PO-Revision-Date: 2010-07-03 17:35-0800\n"
 "Last-Translator: Sabykos\n"
 "Language-Team: Bertilax, Snoozer, wishmasterf, ZEN.13, TheRealVisitor\n"
@@ -2044,12 +2044,12 @@ msgid "To run GameCube games with %s you need to place them on an USB FAT32 part
 msgstr "Deine Festplatte muss auf FAT32 formatiert sein, um GameCube Spiele mit %s% starten zu können."
 
 #, c-format
-msgid "To run GameCube games with %s you need to set your 'Main GameCube Path' on a primary partition."
-msgstr "Dein GameCube Hauptpfad muss auf eine primäre Partition verweisen, um GameCube Spiele mit %s% starten zu können."
+msgid "To run GameCube games with %s you need to set your 'Main GameCube Path' on the first primary FAT32 partition."
+msgstr ""
 
 #, c-format
-msgid "To run GameCube games with %s you need to set your 'Main GameCube Path' on the first partition of the Hard Drive."
-msgstr "Dein GameCube Hauptpfad muss auf die erste Partition deiner Festplatte verweisen, um GameCube Spiele mit %s% starten zu können."
+msgid "To run GameCube games with %s you need to set your 'Main GameCube Path' on the first primary partition of the Hard Drive."
+msgstr ""
 
 #, c-format
 msgid "To run GameCube games with %s you need to set your 'Main GameCube Path' to an USB FAT32 partition."
@@ -2367,6 +2367,12 @@ msgstr "von"
 msgid "seconds left"
 msgstr "Sekunden verbleiben"
 
+#~ msgid "To run GameCube games with %s you need to set your 'Main GameCube Path' on a primary partition."
+#~ msgstr "Dein GameCube Hauptpfad muss auf eine primäre Partition verweisen, um GameCube Spiele mit %s% starten zu können."
+
+#~ msgid "To run GameCube games with %s you need to set your 'Main GameCube Path' on the first partition of the Hard Drive."
+#~ msgstr "Dein GameCube Hauptpfad muss auf die erste Partition deiner Festplatte verweisen, um GameCube Spiele mit %s% starten zu können."
+
 #~ msgid "Anti"
 #~ msgstr "Anti"
 
diff --git a/Languages/greek.lang b/Languages/greek.lang
index cde472cf..58303963 100644
--- a/Languages/greek.lang
+++ b/Languages/greek.lang
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-04 21:00+0100\n"
+"POT-Creation-Date: 2015-02-14 16:29+0100\n"
 "Last-Translator: nakata6790\n"
 "Language-Team: nakata6790 (aka0107@gmail.com)\n"
 "MIME-Version: 1.0\n"
@@ -2043,11 +2043,11 @@ msgid "To run GameCube games with %s you need to place them on an USB FAT32 part
 msgstr ""
 
 #, c-format
-msgid "To run GameCube games with %s you need to set your 'Main GameCube Path' on a primary partition."
+msgid "To run GameCube games with %s you need to set your 'Main GameCube Path' on the first primary FAT32 partition."
 msgstr ""
 
 #, c-format
-msgid "To run GameCube games with %s you need to set your 'Main GameCube Path' on the first partition of the Hard Drive."
+msgid "To run GameCube games with %s you need to set your 'Main GameCube Path' on the first primary partition of the Hard Drive."
 msgstr ""
 
 #, c-format
diff --git a/Languages/hungarian.lang b/Languages/hungarian.lang
index e2031843..0e1a1ab2 100644
--- a/Languages/hungarian.lang
+++ b/Languages/hungarian.lang
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-04 21:00+0100\n"
+"POT-Creation-Date: 2015-02-14 16:29+0100\n"
 "PO-Revision-Date: 2009-12-29 11:05+0100\n"
 "Last-Translator: Springdale\n"
 "Language-Team: Tusk, Springdale\n"
@@ -2044,11 +2044,11 @@ msgid "To run GameCube games with %s you need to place them on an USB FAT32 part
 msgstr ""
 
 #, c-format
-msgid "To run GameCube games with %s you need to set your 'Main GameCube Path' on a primary partition."
+msgid "To run GameCube games with %s you need to set your 'Main GameCube Path' on the first primary FAT32 partition."
 msgstr ""
 
 #, c-format
-msgid "To run GameCube games with %s you need to set your 'Main GameCube Path' on the first partition of the Hard Drive."
+msgid "To run GameCube games with %s you need to set your 'Main GameCube Path' on the first primary partition of the Hard Drive."
 msgstr ""
 
 #, c-format
diff --git a/Languages/italian.lang b/Languages/italian.lang
index 6d1610ed..e4653584 100644
--- a/Languages/italian.lang
+++ b/Languages/italian.lang
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-04 21:00+0100\n"
+"POT-Creation-Date: 2015-02-14 16:29+0100\n"
 "PO-Revision-Date: 2011-09-11 12:19+0100\n"
 "Last-Translator: xFede\n"
 "Language-Team: xFede (fedeanto11@gmail.com)\n"
@@ -2044,11 +2044,11 @@ msgid "To run GameCube games with %s you need to place them on an USB FAT32 part
 msgstr ""
 
 #, c-format
-msgid "To run GameCube games with %s you need to set your 'Main GameCube Path' on a primary partition."
+msgid "To run GameCube games with %s you need to set your 'Main GameCube Path' on the first primary FAT32 partition."
 msgstr ""
 
 #, c-format
-msgid "To run GameCube games with %s you need to set your 'Main GameCube Path' on the first partition of the Hard Drive."
+msgid "To run GameCube games with %s you need to set your 'Main GameCube Path' on the first primary partition of the Hard Drive."
 msgstr ""
 
 #, c-format
diff --git a/Languages/japanese.lang b/Languages/japanese.lang
index 675e125e..7e66522b 100644
--- a/Languages/japanese.lang
+++ b/Languages/japanese.lang
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-04 21:00+0100\n"
+"POT-Creation-Date: 2015-02-14 16:29+0100\n"
 "PO-Revision-Date: 2009-10-01 01:00+0200\n"
 "Last-Translator: hosigumayuugi\n"
 "Language-Team: hosigumayuugi\n"
@@ -2044,11 +2044,11 @@ msgid "To run GameCube games with %s you need to place them on an USB FAT32 part
 msgstr ""
 
 #, c-format
-msgid "To run GameCube games with %s you need to set your 'Main GameCube Path' on a primary partition."
+msgid "To run GameCube games with %s you need to set your 'Main GameCube Path' on the first primary FAT32 partition."
 msgstr ""
 
 #, c-format
-msgid "To run GameCube games with %s you need to set your 'Main GameCube Path' on the first partition of the Hard Drive."
+msgid "To run GameCube games with %s you need to set your 'Main GameCube Path' on the first primary partition of the Hard Drive."
 msgstr ""
 
 #, c-format
diff --git a/Languages/korean.lang b/Languages/korean.lang
index a60b10e2..3b625c8f 100644
--- a/Languages/korean.lang
+++ b/Languages/korean.lang
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-04 21:00+0100\n"
+"POT-Creation-Date: 2015-02-14 16:29+0100\n"
 "PO-Revision-Date: 2009-10-01 01:00+0200\n"
 "Last-Translator: nextos@korea.com\n"
 "Language-Team: \n"
@@ -2044,11 +2044,11 @@ msgid "To run GameCube games with %s you need to place them on an USB FAT32 part
 msgstr ""
 
 #, c-format
-msgid "To run GameCube games with %s you need to set your 'Main GameCube Path' on a primary partition."
+msgid "To run GameCube games with %s you need to set your 'Main GameCube Path' on the first primary FAT32 partition."
 msgstr ""
 
 #, c-format
-msgid "To run GameCube games with %s you need to set your 'Main GameCube Path' on the first partition of the Hard Drive."
+msgid "To run GameCube games with %s you need to set your 'Main GameCube Path' on the first primary partition of the Hard Drive."
 msgstr ""
 
 #, c-format
diff --git a/Languages/norwegian.lang b/Languages/norwegian.lang
index 0ea409e5..22e6fcf7 100644
--- a/Languages/norwegian.lang
+++ b/Languages/norwegian.lang
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-04 21:00+0100\n"
+"POT-Creation-Date: 2015-02-14 16:29+0100\n"
 "PO-Revision-Date: 2009-10-01 01:00+0200\n"
 "Last-Translator: raschi\n"
 "Language-Team: raschi\n"
@@ -2044,11 +2044,11 @@ msgid "To run GameCube games with %s you need to place them on an USB FAT32 part
 msgstr ""
 
 #, c-format
-msgid "To run GameCube games with %s you need to set your 'Main GameCube Path' on a primary partition."
+msgid "To run GameCube games with %s you need to set your 'Main GameCube Path' on the first primary FAT32 partition."
 msgstr ""
 
 #, c-format
-msgid "To run GameCube games with %s you need to set your 'Main GameCube Path' on the first partition of the Hard Drive."
+msgid "To run GameCube games with %s you need to set your 'Main GameCube Path' on the first primary partition of the Hard Drive."
 msgstr ""
 
 #, c-format
diff --git a/Languages/polish.lang b/Languages/polish.lang
index cce9989b..c933eefd 100644
--- a/Languages/polish.lang
+++ b/Languages/polish.lang
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-04 21:00+0100\n"
+"POT-Creation-Date: 2015-02-14 16:29+0100\n"
 "PO-Revision-Date: 2009-10-01 01:00+0200\n"
 "Last-Translator: ziom666 (zadania_prog@vp.pl)\n"
 "Language-Team: \n"
@@ -2044,11 +2044,11 @@ msgid "To run GameCube games with %s you need to place them on an USB FAT32 part
 msgstr ""
 
 #, c-format
-msgid "To run GameCube games with %s you need to set your 'Main GameCube Path' on a primary partition."
+msgid "To run GameCube games with %s you need to set your 'Main GameCube Path' on the first primary FAT32 partition."
 msgstr ""
 
 #, c-format
-msgid "To run GameCube games with %s you need to set your 'Main GameCube Path' on the first partition of the Hard Drive."
+msgid "To run GameCube games with %s you need to set your 'Main GameCube Path' on the first primary partition of the Hard Drive."
 msgstr ""
 
 #, c-format
diff --git a/Languages/portuguese_br.lang b/Languages/portuguese_br.lang
index 69a4730d..883b48c3 100644
--- a/Languages/portuguese_br.lang
+++ b/Languages/portuguese_br.lang
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-04 21:00+0100\n"
+"POT-Creation-Date: 2015-02-14 16:29+0100\n"
 "PO-Revision-Date: 2011-11-03 11:00+0000\n"
 "Last-Translator: Codemaster <javafangamers@hotmail.com>\n"
 "Language-Team: Sky8000, pplucky\n"
@@ -2044,12 +2044,12 @@ msgid "To run GameCube games with %s you need to place them on an USB FAT32 part
 msgstr "Para rodar jogos de GameCube com %s, você precisa de um drive USB formatado em FAT32."
 
 #, c-format
-msgid "To run GameCube games with %s you need to set your 'Main GameCube Path' on a primary partition."
-msgstr "Para rodar jogos de GameCube com %s, você precisa escolher uma pasta que esteja numa partição primária."
+msgid "To run GameCube games with %s you need to set your 'Main GameCube Path' on the first primary FAT32 partition."
+msgstr ""
 
 #, c-format
-msgid "To run GameCube games with %s you need to set your 'Main GameCube Path' on the first partition of the Hard Drive."
-msgstr "Para rodar jogos de GameCube com %s, você precisa escolher uma pasta que esteja na primeira partição do disco rígido."
+msgid "To run GameCube games with %s you need to set your 'Main GameCube Path' on the first primary partition of the Hard Drive."
+msgstr ""
 
 #, c-format
 msgid "To run GameCube games with %s you need to set your 'Main GameCube Path' to an USB FAT32 partition."
@@ -2366,3 +2366,9 @@ msgstr "de"
 
 msgid "seconds left"
 msgstr "segundos restantes"
+
+#~ msgid "To run GameCube games with %s you need to set your 'Main GameCube Path' on a primary partition."
+#~ msgstr "Para rodar jogos de GameCube com %s, você precisa escolher uma pasta que esteja numa partição primária."
+
+#~ msgid "To run GameCube games with %s you need to set your 'Main GameCube Path' on the first partition of the Hard Drive."
+#~ msgstr "Para rodar jogos de GameCube com %s, você precisa escolher uma pasta que esteja na primeira partição do disco rígido."
diff --git a/Languages/portuguese_pt.lang b/Languages/portuguese_pt.lang
index 77cb3ba4..0c7b0a88 100644
--- a/Languages/portuguese_pt.lang
+++ b/Languages/portuguese_pt.lang
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-04 21:00+0100\n"
+"POT-Creation-Date: 2015-02-14 16:29+0100\n"
 "PO-Revision-Date: 2011-11-03 11:00+0000\n"
 "Last-Translator: pplucky <pplucky@gmail.com>\n"
 "Language-Team: Sky8000, pplucky\n"
@@ -2044,11 +2044,11 @@ msgid "To run GameCube games with %s you need to place them on an USB FAT32 part
 msgstr ""
 
 #, c-format
-msgid "To run GameCube games with %s you need to set your 'Main GameCube Path' on a primary partition."
+msgid "To run GameCube games with %s you need to set your 'Main GameCube Path' on the first primary FAT32 partition."
 msgstr ""
 
 #, c-format
-msgid "To run GameCube games with %s you need to set your 'Main GameCube Path' on the first partition of the Hard Drive."
+msgid "To run GameCube games with %s you need to set your 'Main GameCube Path' on the first primary partition of the Hard Drive."
 msgstr ""
 
 #, c-format
diff --git a/Languages/russian.lang b/Languages/russian.lang
index ac62f89e..2f5ab894 100644
--- a/Languages/russian.lang
+++ b/Languages/russian.lang
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-04 21:00+0100\n"
+"POT-Creation-Date: 2015-02-14 16:29+0100\n"
 "PO-Revision-Date: 2009-10-01 01:00+0200\n"
 "Last-Translator: nikolai_ca\n"
 "Language-Team: Kir, alendit, nikolai_ca\n"
@@ -2044,11 +2044,11 @@ msgid "To run GameCube games with %s you need to place them on an USB FAT32 part
 msgstr ""
 
 #, c-format
-msgid "To run GameCube games with %s you need to set your 'Main GameCube Path' on a primary partition."
+msgid "To run GameCube games with %s you need to set your 'Main GameCube Path' on the first primary FAT32 partition."
 msgstr ""
 
 #, c-format
-msgid "To run GameCube games with %s you need to set your 'Main GameCube Path' on the first partition of the Hard Drive."
+msgid "To run GameCube games with %s you need to set your 'Main GameCube Path' on the first primary partition of the Hard Drive."
 msgstr ""
 
 #, c-format
diff --git a/Languages/schinese.lang b/Languages/schinese.lang
index 4ec86f2b..5d391520 100644
--- a/Languages/schinese.lang
+++ b/Languages/schinese.lang
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-04 21:00+0100\n"
+"POT-Creation-Date: 2015-02-14 16:29+0100\n"
 "PO-Revision-Date: 2013-08-13 07:03+0800\n"
 "Last-Translator: \n"
 "Language-Team: oCameLo\n"
@@ -2044,12 +2044,12 @@ msgid "To run GameCube games with %s you need to place them on an USB FAT32 part
 msgstr "为了运行Gamecube游戏需要用%s替换在fat32分区usb上面的内容。"
 
 #, c-format
-msgid "To run GameCube games with %s you need to set your 'Main GameCube Path' on a primary partition."
-msgstr "为了运行Gamecube游戏需要用%s设置你的'主Gamecube路径'在主分区上."
+msgid "To run GameCube games with %s you need to set your 'Main GameCube Path' on the first primary FAT32 partition."
+msgstr ""
 
 #, c-format
-msgid "To run GameCube games with %s you need to set your 'Main GameCube Path' on the first partition of the Hard Drive."
-msgstr "为了运行Gamecube游戏需要用%s设置你的'主Gamecube路径'在第一个主分区上."
+msgid "To run GameCube games with %s you need to set your 'Main GameCube Path' on the first primary partition of the Hard Drive."
+msgstr ""
 
 #, c-format
 msgid "To run GameCube games with %s you need to set your 'Main GameCube Path' to an USB FAT32 partition."
@@ -2367,6 +2367,12 @@ msgstr "的"
 msgid "seconds left"
 msgstr "剩余秒数"
 
+#~ msgid "To run GameCube games with %s you need to set your 'Main GameCube Path' on a primary partition."
+#~ msgstr "为了运行Gamecube游戏需要用%s设置你的'主Gamecube路径'在主分区上."
+
+#~ msgid "To run GameCube games with %s you need to set your 'Main GameCube Path' on the first partition of the Hard Drive."
+#~ msgstr "为了运行Gamecube游戏需要用%s设置你的'主Gamecube路径'在第一个主分区上."
+
 #~ msgid "Error 002 fix"
 #~ msgstr "002 错误修正"
 
diff --git a/Languages/spanish.lang b/Languages/spanish.lang
index ccb8825a..ab65ff9a 100644
--- a/Languages/spanish.lang
+++ b/Languages/spanish.lang
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-04 21:00+0100\n"
+"POT-Creation-Date: 2015-02-14 16:29+0100\n"
 "PO-Revision-Date: 2011-07-25 16:40+0200\n"
 "Last-Translator: Galen/xFede\n"
 "Language-Team: Penn, SirPalax, hvy109\n"
@@ -2044,12 +2044,12 @@ msgid "To run GameCube games with %s you need to place them on an USB FAT32 part
 msgstr "Para cargar juegos de GameCube con %s debes ponerlos en un USB con formato FAT32."
 
 #, c-format
-msgid "To run GameCube games with %s you need to set your 'Main GameCube Path' on a primary partition."
-msgstr "Para cargar juegos de GameCube con %s debes configurar tu Ruta GameCube principal en una partición primaria."
+msgid "To run GameCube games with %s you need to set your 'Main GameCube Path' on the first primary FAT32 partition."
+msgstr ""
 
 #, c-format
-msgid "To run GameCube games with %s you need to set your 'Main GameCube Path' on the first partition of the Hard Drive."
-msgstr "Para cargar juegos de GameCube con %s debes configurar tu Ruta GameCube principal en la primer partición del USB."
+msgid "To run GameCube games with %s you need to set your 'Main GameCube Path' on the first primary partition of the Hard Drive."
+msgstr ""
 
 #, c-format
 msgid "To run GameCube games with %s you need to set your 'Main GameCube Path' to an USB FAT32 partition."
@@ -2367,6 +2367,12 @@ msgstr "de"
 msgid "seconds left"
 msgstr "segundos restantes"
 
+#~ msgid "To run GameCube games with %s you need to set your 'Main GameCube Path' on a primary partition."
+#~ msgstr "Para cargar juegos de GameCube con %s debes configurar tu Ruta GameCube principal en una partición primaria."
+
+#~ msgid "To run GameCube games with %s you need to set your 'Main GameCube Path' on the first partition of the Hard Drive."
+#~ msgstr "Para cargar juegos de GameCube con %s debes configurar tu Ruta GameCube principal en la primer partición del USB."
+
 #~ msgid "Anti"
 #~ msgstr "Anti"
 
@@ -2561,4 +2567,3 @@ msgstr "segundos restantes"
 
 #~ msgid "for WiiTDB and hosting covers / disc images"
 #~ msgstr "por WiiTDB y alojar carátulas e imágenes"
-
diff --git a/Languages/swedish.lang b/Languages/swedish.lang
index b48b97da..e085d0fe 100644
--- a/Languages/swedish.lang
+++ b/Languages/swedish.lang
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-04 21:00+0100\n"
+"POT-Creation-Date: 2015-02-14 16:29+0100\n"
 "PO-Revision-Date: 2010-01-19 17:39+0200\n"
 "Last-Translator: Katsurou\n"
 "Language-Team: Katsurou, pirateX\n"
@@ -2044,11 +2044,11 @@ msgid "To run GameCube games with %s you need to place them on an USB FAT32 part
 msgstr ""
 
 #, c-format
-msgid "To run GameCube games with %s you need to set your 'Main GameCube Path' on a primary partition."
+msgid "To run GameCube games with %s you need to set your 'Main GameCube Path' on the first primary FAT32 partition."
 msgstr ""
 
 #, c-format
-msgid "To run GameCube games with %s you need to set your 'Main GameCube Path' on the first partition of the Hard Drive."
+msgid "To run GameCube games with %s you need to set your 'Main GameCube Path' on the first primary partition of the Hard Drive."
 msgstr ""
 
 #, c-format
diff --git a/Languages/tchinese.lang b/Languages/tchinese.lang
index c76ba079..0a82084e 100644
--- a/Languages/tchinese.lang
+++ b/Languages/tchinese.lang
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-04 21:00+0100\n"
+"POT-Creation-Date: 2015-02-14 16:29+0100\n"
 "PO-Revision-Date: 2010-02-15 21:00+0800\n"
 "Last-Translator: Jane.H\n"
 "Language-Team: kyogc, Miller, Mika Li, Jane.H\n"
@@ -2044,11 +2044,11 @@ msgid "To run GameCube games with %s you need to place them on an USB FAT32 part
 msgstr ""
 
 #, c-format
-msgid "To run GameCube games with %s you need to set your 'Main GameCube Path' on a primary partition."
+msgid "To run GameCube games with %s you need to set your 'Main GameCube Path' on the first primary FAT32 partition."
 msgstr ""
 
 #, c-format
-msgid "To run GameCube games with %s you need to set your 'Main GameCube Path' on the first partition of the Hard Drive."
+msgid "To run GameCube games with %s you need to set your 'Main GameCube Path' on the first primary partition of the Hard Drive."
 msgstr ""
 
 #, c-format
diff --git a/Languages/thai.lang b/Languages/thai.lang
index 9d954e8f..a70fce26 100644
--- a/Languages/thai.lang
+++ b/Languages/thai.lang
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-04 21:00+0100\n"
+"POT-Creation-Date: 2015-02-14 16:29+0100\n"
 "PO-Revision-Date: 2009-10-01 01:00+0200\n"
 "Last-Translator: Nitro_subzero \n"
 "Language-Team: Nitro_subzero\n"
@@ -2044,11 +2044,11 @@ msgid "To run GameCube games with %s you need to place them on an USB FAT32 part
 msgstr ""
 
 #, c-format
-msgid "To run GameCube games with %s you need to set your 'Main GameCube Path' on a primary partition."
+msgid "To run GameCube games with %s you need to set your 'Main GameCube Path' on the first primary FAT32 partition."
 msgstr ""
 
 #, c-format
-msgid "To run GameCube games with %s you need to set your 'Main GameCube Path' on the first partition of the Hard Drive."
+msgid "To run GameCube games with %s you need to set your 'Main GameCube Path' on the first primary partition of the Hard Drive."
 msgstr ""
 
 #, c-format
diff --git a/Languages/turkish.lang b/Languages/turkish.lang
index a3e665d6..25bb773f 100644
--- a/Languages/turkish.lang
+++ b/Languages/turkish.lang
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-04 21:00+0100\n"
+"POT-Creation-Date: 2015-02-14 16:29+0100\n"
 "PO-Revision-Date: 2009-10-01 01:00+0200\n"
 "Last-Translator: omercigingelini\n"
 "Language-Team: omercigingelini\n"
@@ -2044,11 +2044,11 @@ msgid "To run GameCube games with %s you need to place them on an USB FAT32 part
 msgstr ""
 
 #, c-format
-msgid "To run GameCube games with %s you need to set your 'Main GameCube Path' on a primary partition."
+msgid "To run GameCube games with %s you need to set your 'Main GameCube Path' on the first primary FAT32 partition."
 msgstr ""
 
 #, c-format
-msgid "To run GameCube games with %s you need to set your 'Main GameCube Path' on the first partition of the Hard Drive."
+msgid "To run GameCube games with %s you need to set your 'Main GameCube Path' on the first primary partition of the Hard Drive."
 msgstr ""
 
 #, c-format
diff --git a/source/settings/menus/FeatureSettingsMenu.cpp b/source/settings/menus/FeatureSettingsMenu.cpp
index 6950eefb..a284ad65 100644
--- a/source/settings/menus/FeatureSettingsMenu.cpp
+++ b/source/settings/menus/FeatureSettingsMenu.cpp
@@ -41,6 +41,7 @@
 #include "language/gettext.h"
 #include "wad/nandtitle.h"
 #include "wad/wad.h"
+#include "sys.h"
 
 static const char * OnOffText[] =
 {
@@ -553,7 +554,7 @@ int FeatureSettingsMenu::GetMenuInternal()
 	// WiiU Aspect switcher (Thanks Tueidj)
 	else if (ret == ++Idx)
 	{
-		if((*(vu32*)(0xCD8005A0) >> 16 ) == 0xCAFE) // vWii only
+		if(isWiiU()) // vWii only
 		{
 			if( read32(0xd8006a0) == 0x30000004)
 			{
diff --git a/source/sys.cpp b/source/sys.cpp
index cc65473d..38e68883 100644
--- a/source/sys.cpp
+++ b/source/sys.cpp
@@ -292,3 +292,12 @@ void ScreenShot()
 
 	TakeScreenshot(fullPath);
 }
+
+/*
+ * Check if the current console is a Wii or WiiU
+ * Thanks to Crediar
+ */
+bool isWiiU()
+{
+	return ((*(vu32*)(0xCD8005A0) >> 16 ) == 0xCAFE);
+}
diff --git a/source/sys.h b/source/sys.h
index ce79197d..894896e3 100644
--- a/source/sys.h
+++ b/source/sys.h
@@ -15,6 +15,7 @@ void Sys_LoadMenu(void);
 void Sys_BackToLoader(void);
 void Sys_LoadHBC(void);
 bool RebootApp(void);
-void ScreenShot();
+void ScreenShot(void);
+bool isWiiU(void);
 
 #endif
diff --git a/source/system/IosLoader.cpp b/source/system/IosLoader.cpp
index 37e0bbcd..27cd906c 100644
--- a/source/system/IosLoader.cpp
+++ b/source/system/IosLoader.cpp
@@ -2,6 +2,7 @@
 #include <ogc/machine/processor.h>
 
 #include "IosLoader.h"
+#include "sys.h"
 #include "Controls/DeviceHandler.hpp"
 #include "usbloader/usbstorage2.h"
 #include "usbloader/disc.h"
@@ -523,15 +524,6 @@ bool IosLoader::is_NandEmu_compatible(const char *NandEmuPath, s32 ios)
 	return true;
 }
 
-/*
- * Check if the current console is a Wii or WiiU
- * Thanks to Crediar
- */
-bool IosLoader::isWiiU()
-{
-	return ((*(vu32*)(0xCD8005A0) >> 16 ) == 0xCAFE);
-}
-
 /******************************************************************************
  * Private/Protected Methods:
  ******************************************************************************/
diff --git a/source/system/IosLoader.h b/source/system/IosLoader.h
index bb1acf13..85a3450c 100644
--- a/source/system/IosLoader.h
+++ b/source/system/IosLoader.h
@@ -95,7 +95,6 @@ class IosLoader
 		static u8 GetMIOSInfo();
 		static u8 GetDMLVersion(char* releaseDate = NULL);
 		static bool is_NandEmu_compatible(const char *NandEmuPath, s32 ios = IOS_GetVersion());
-		static bool isWiiU();
 	private:
 		static void LoadIOSModules(s32 ios, s32 ios_rev);
 };
diff --git a/source/usbloader/GameBooter.cpp b/source/usbloader/GameBooter.cpp
index f37aaa58..b26ed441 100644
--- a/source/usbloader/GameBooter.cpp
+++ b/source/usbloader/GameBooter.cpp
@@ -462,21 +462,26 @@ int GameBooter::BootDIOSMIOS(struct discHdr *gameHdr)
 			return 0;
 		}
 
-		// Check if the partition is the first partition on the drive
-		int part_num = atoi(Settings.GameCubePath+3);
-		int portPart = DeviceHandler::PartitionToPortPartition(part_num-USB1);
-		int usbport = DeviceHandler::PartitionToUSBPort(part_num-USB1);
-		PartitionHandle * usbHandle = DeviceHandler::Instance()->GetUSBHandleFromPartition(part_num-USB1);
-		if(usbHandle->GetPartitionNum(portPart))
+		// Check if the partition is the first primary partition on the drive
+		bool found = false;
+		int USB_partNum = DeviceHandler::PathToDriveType(Settings.GameCubePath)-USB1;
+		int USBport_partNum = DeviceHandler::PartitionToPortPartition(USB_partNum);
+		int usbport = DeviceHandler::PartitionToUSBPort(USB_partNum);
+		PartitionHandle * usbHandle = DeviceHandler::Instance()->GetUSBHandleFromPartition(USB_partNum);
+		for(int partition = 0 ; partition <= USBport_partNum; partition++)
 		{
-			WindowPrompt(tr("Error:"), fmt(tr("To run GameCube games with %s you need to set your 'Main GameCube Path' on the first partition of the Hard Drive."),LoaderName), tr("OK"));
-			return 0;
+			if(usbHandle->GetPartitionTableType(partition) != MBR)
+				continue;
+			
+			if(partition == USBport_partNum)
+			{
+				found = true;
+				break;
+			}
 		}
-
-		// Check if the partition is primary
-		if(usbHandle->GetPartitionTableType(portPart) != MBR)
+		if(!found)
 		{
-			WindowPrompt(tr("Error:"), fmt(tr("To run GameCube games with %s you need to set your 'Main GameCube Path' on a primary partition."),LoaderName), tr("OK"));
+			WindowPrompt(tr("Error:"), fmt(tr("To run GameCube games with %s you need to set your 'Main GameCube Path' on the first primary partition of the Hard Drive."),LoaderName), tr("OK"));
 			return 0;
 		}
 		
@@ -487,7 +492,7 @@ int GameBooter::BootDIOSMIOS(struct discHdr *gameHdr)
 			return 0;
 		}
 
-		if(usbHandle->GetPartitionClusterSize(usbHandle->GetLBAStart(portPart)) > 32768)
+		if(usbHandle->GetPartitionClusterSize(usbHandle->GetLBAStart(USBport_partNum)) > 32768)
 		{
 			WindowPrompt(tr("Error:"), fmt(tr("To run GameCube games with %s you need to use a partition with 32k bytes/cluster or less."),LoaderName), tr("OK"));
 			return 0;
@@ -973,20 +978,32 @@ int GameBooter::BootNintendont(struct discHdr *gameHdr)
 			return 0;
 		}
 
-		// Check if the partition is the first partition on the drive
-		int part_num = atoi(Settings.GameCubePath+3);
-		int portPart = DeviceHandler::PartitionToPortPartition(part_num-USB1);
-		PartitionHandle * usbHandle = DeviceHandler::Instance()->GetUSBHandleFromPartition(part_num-USB1);
-		if(usbHandle->GetPartitionNum(portPart))
+		// Check if the partition is a primary
+		int USB_partNum = DeviceHandler::PathToDriveType(Settings.GameCubePath)-USB1;
+		int USBport_partNum = DeviceHandler::PartitionToPortPartition(USB_partNum);
+		PartitionHandle * usbHandle = DeviceHandler::Instance()->GetUSBHandleFromPartition(USB_partNum);
+		if(usbHandle->GetPartitionTableType(USBport_partNum) != MBR)
 		{
-			WindowPrompt(tr("Error:"), fmt(tr("To run GameCube games with %s you need to set your 'Main GameCube Path' on the first partition of the Hard Drive."),LoaderName), tr("OK"));
+			WindowPrompt(tr("Error:"), fmt(tr("To run GameCube games with %s you need to set your 'Main GameCube Path' on the first primary FAT32 partition."),LoaderName), tr("OK"));
 			return 0;
 		}
-
-		// Check if the partition is primary
-		if(usbHandle->GetPartitionTableType(portPart) != MBR)
+		
+		// check if the partition is the first FAT32 of the drive
+		bool found = false;
+		for(int partition = 0 ; partition <= USBport_partNum; partition++)
 		{
-			WindowPrompt(tr("Error:"), fmt(tr("To run GameCube games with %s you need to set your 'Main GameCube Path' on a primary partition."),LoaderName), tr("OK"));
+			if(strncmp(usbHandle->GetFSName(partition), "FAT", 3) != 0)
+				continue;
+			
+			if(partition == USBport_partNum)
+			{
+				found = true;
+				break;
+			}
+		}
+		if(!found)
+		{
+			WindowPrompt(tr("Error:"), fmt(tr("To run GameCube games with %s you need to set your 'Main GameCube Path' on the first primary FAT32 partition."),LoaderName), tr("OK"));
 			return 0;
 		}
 	}
@@ -1304,7 +1321,7 @@ int GameBooter::BootNintendont(struct discHdr *gameHdr)
 
 	
 	// Set other settings
-	if(ninDebugChoice && !IosLoader::isWiiU()) // only on Wii
+	if(ninDebugChoice && !isWiiU()) // only on Wii
 		nin_config->Config |= ninDebugChoice == ON ? NIN_CFG_DEBUGGER : NIN_CFG_DEBUGGER | NIN_CFG_DEBUGWAIT;
 	if(ninMCEmulationChoice)
 		nin_config->Config |= NIN_CFG_MEMCARDEMU;
diff --git a/source/video.cpp b/source/video.cpp
index 8f95bd47..4faa3ee6 100644
--- a/source/video.cpp
+++ b/source/video.cpp
@@ -20,6 +20,7 @@
 #include "ImageOperations/ImageWrite.h"
 #include "settings/CSettings.h"
 #include "input.h"
+#include "sys.h"
 #include "gecko.h"
 
 #define GP_FIFO_SIZE (256 * 1024 * 3)
@@ -115,7 +116,7 @@ void InitVideo()
 	VIDEO_Init();
 	
 	// If WiiU - Force 16:9 aspect ratio based on WiiU settings
-	if((*(vu32*)(0xCD8005A0) >> 16 ) == 0xCAFE && Settings.widescreen)
+	if(isWiiU() && Settings.widescreen)
 	{
 		write32(0xd8006a0, 0x30000004), mask32(0xd8006a8, 0, 2);		
 	}