Boot with IOS58 but reload to a cIOS

Makefile

@@ -56,7 +56,7 @@ DATA		:=	data \
 INCLUDES	:=	source
 
 #---------------------------------------------------------------------------------
-# Default cIOS to load into to load the settings
+# default IOS used when booting
 #---------------------------------------------------------------------------------
 ifndef $(IOS)
 IOS = 58

source/StartUpProcess.cpp

@@ -236,27 +236,31 @@ int StartUpProcess::Execute()
 {
 	Settings.EntryIOS = IOS_GetVersion();
 
-	// Reloading to IOS 249 fixes compatibility issues with old forwarders
+	// Reloading to cIOS 249 fixes compatibility issues with old forwarders
 	IosLoader::ReloadIosSafe(249);
 
-	// Reload to the default IOS or the IOS set in meta.xml
+	// Reload to the IOS set in meta.xml
-	SetTextf("Loading application cIOS %s\n", Settings.UseArgumentIOS ? "requested in meta.xml" : "");
+	if(Settings.UseArgumentIOS)
-	if(IosLoader::LoadAppCios() < 0)
 	{
-		SetTextf("Failed loading any cIOS. Trying with IOS58 + AHB access...");
+		SetTextf("Loading %sIOS %i requested in meta.xml\n", Settings.LoaderIOS >= 200 ? "c" : "", Settings.LoaderIOS);
-		
+		if(IosLoader::ReloadIosSafe(Settings.LoaderIOS) < 0)
-		// We can allow now operation without cIOS in channel mode with AHB access
-		if(!AHBPROT_DISABLED || (AHBPROT_DISABLED && IOS_GetVersion() != 58))
 		{
-			SetTextf("Failed loading IOS 58. USB Loader GX requires a cIOS or IOS 58 with AHB access. Exiting...\n");
+			SetTextf("Failed to load %sIOS %i requested in meta.xml. Exiting...\n", Settings.LoaderIOS >= 200 ? "c" : "", Settings.LoaderIOS);
 			sleep(5);
 			Sys_BackToLoader();
 		}
-		else
+	}
+	else if(BUILD_IOS != 249)
 	{
-			Settings.LoaderIOS = 58;
+		// Reload to the default IOS (58) if nothing is set in meta.xml
-			SetTextf("Running on IOS 58. Wii disc based games and some channels will not work.");
+		IosLoader::ReloadIosSafe(BUILD_IOS);
+
+		if(!AHBPROT_DISABLED || (AHBPROT_DISABLED && IOS_GetVersion() != BUILD_IOS))
+		{
+			
+			SetTextf("Failed loading %sIOS %i. USB Loader GX requires a cIOS or IOS58 with AHB access. Exiting...\n", BUILD_IOS >= 200 ? "c" : "", BUILD_IOS);
 			sleep(5);
+			Sys_BackToLoader();
 		}
 	}
 
@@ -267,23 +271,20 @@ int StartUpProcess::Execute()
 		Sys_BackToLoader();
 	}
 
-	SetTextf("Using %sIOS %i\n", IOS_GetVersion() >= 200 ? "c" : "", IOS_GetVersion());
-	
 	SetupPads();
 
-	SetTextf("Initialize sd card\n");
+	SetTextf("Initializing sd card\n");
 	DeviceHandler::Instance()->MountSD();
 
 	// Do not mount USB if not needed. USB is not available with WiiU WiiVC injected channel.
 	if(Settings.USBAutoMount == ON && !isWiiVC)
 	{
-		SetTextf("Initialize usb device\n");
+		SetTextf("Initializing usb devices\n");
 		USBSpinUp();
 		DeviceHandler::Instance()->MountAllUSB(false);
 	}
 
 	SetTextf("Loading config files\n");
-	
 	gprintf("\tLoading config...%s\n", Settings.Load() ? "done" : "failed");
 	gprintf("\tLoading language...%s\n", Settings.LoadLanguage(Settings.language_path, CONSOLE_DEFAULT) ? "done" : "failed");
 	gprintf("\tLoading game settings...%s\n", GameSettings.Load(Settings.ConfigPath) ? "done" : "failed");
@@ -292,11 +293,9 @@ int StartUpProcess::Execute()
 	if(Settings.CacheTitles)
 		gprintf("\tLoading cached titles...%s\n", GameTitles.ReadCachedTitles(Settings.titlestxt_path) ? "done" : "failed (using default)");
 
-	// Reload to user's settings if different than current IOS, and if not using an injected WiiU WiiVC IOS255 (fw.img)
+	// Reload to users settings if different than current IOS, and if not using an injected WiiU WiiVC IOS255 (fw.img)
-	if(Settings.LoaderIOS != IOS_GetVersion() && !isWiiVC)
+	if(Settings.LoaderIOS != IOS_GetVersion() && !isWiiVC && !Settings.UseArgumentIOS)
 	{
-		SetTextf("Reloading to config files cIOS...\n");
-		
 		// Unmount devices
 		DeviceHandler::DestroyInstance();
 		if(Settings.USBAutoMount == ON)
@@ -305,13 +304,13 @@ int StartUpProcess::Execute()
 		// Shut down pads
 		Wpad_Disconnect();
 
-		// Loading now the cios setup in the settings
+		// Loading now the cIOS setup in the settings
 		IosLoader::LoadAppCios();
 
 		SetTextf("Reloaded into cIOS %i R%i\n", IOS_GetVersion(), IOS_GetRevision());
 
 		// Re-Mount devices
-		SetTextf("Reinitializing devices...\n");
+		SetTextf("Reinitializing devices\n");
 		DeviceHandler::Instance()->MountSD();
 		if(Settings.USBAutoMount == ON)
 		{
@@ -345,12 +344,12 @@ int StartUpProcess::Execute()
 		}
 	}
 
-	// enable isfs permission if using Hermes v4 without AHB, or WiiU WiiVC (IOS255 fw.img)
+	// Enable isfs permission if using Hermes v4 without AHB, or WiiU WiiVC (IOS255 fw.img)
 	if(IOS_GetVersion() < 200 || (IosLoader::IsHermesIOS() && IOS_GetRevision() == 4) || isWiiVC)
 	{
-		SetTextf("Patching %sIOS%d...\n", IOS_GetVersion() >= 200 ? "c" : "", IOS_GetVersion());
+		SetTextf("Patching %sIOS%i\n", IOS_GetVersion() >= 200 ? "c" : "", IOS_GetVersion());
 		if (IosPatch_RUNTIME(!isWiiVC, false, false, isWiiVC, false) == ERROR_PATCH)
-			gprintf("Patching %sIOS%d failed!\n", IOS_GetVersion() >= 200 ? "c" : "", IOS_GetVersion());
+			gprintf("Patching %sIOS%i failed!\n", IOS_GetVersion() >= 200 ? "c" : "", IOS_GetVersion());
 		else
 			NandTitles.Get(); // get NAND channel's titles
 	}
@@ -359,7 +358,7 @@ int StartUpProcess::Execute()
 	ISFS_Initialize();
 
 	// Check MIOS version
-	SetTextf("Checking installed MIOS... ");
+	SetTextf("Checking installed MIOS\n");
 	IosLoader::GetMIOSInfo();
 
 	SetTextf("Loading resources\n");

source/settings/CSettings.cpp

@@ -118,7 +118,7 @@ void CSettings::SetDefault()
 	tooltips = ON;
 	gamesound = ON;
 	parentalcontrol = PARENTAL_LVL_ADULT;
-	LoaderIOS = BUILD_IOS;
+	LoaderIOS = 249;
 	cios = 249;
 	gridRows = 3;
 	partition = 0;