From bf191ec70ace0e79de06d7e1141a163f628887d1 Mon Sep 17 00:00:00 2001
From: Christopher Roy Bratusek <nano@tuxfamily.org>
Date: Wed, 28 Nov 2012 19:54:57 +0100
Subject: [PATCH] fixups

---
 installer/wad/0001000154484246.tmd | Bin 592 -> 592 bytes
 main/source/main.cpp               | 188 ++++++++++++++---------------
 2 files changed, 92 insertions(+), 96 deletions(-)

diff --git a/installer/wad/0001000154484246.tmd b/installer/wad/0001000154484246.tmd
index d82c963c7633c308bdf6c7c34263b36cb8fe5600..d670a10205e1185384232e59318e461b27c70645 100644
GIT binary patch
delta 33
pcmcb>a)D)oIFqQuMX?JG5qBjjLQXm+Z9cj=L)7ry;mJBoDgfm$4YB|L

delta 33
pcmcb>a)D)oIFo2Y)SB?OSEj^ou{Ck)5!lLCU2J$<e6kLc3IOMr48#Bc

diff --git a/main/source/main.cpp b/main/source/main.cpp
index 1aa0a48..1084d16 100644
--- a/main/source/main.cpp
+++ b/main/source/main.cpp
@@ -271,105 +271,101 @@ main(int argc, char *argv[])
 			BootGameCubeHomebrew();
     }
     else if(boot_buffer)
-	if(wiiload)
-	{
-		BootHomebrew();
-	}
-
-	if(get_bootmii() != 0)
-	{
-        if(Options.bootmii_boot2)
+    {
+        if(wiiload)
         {
-            xprintf("Load BootMii (Boot2)\n");
+            BootHomebrew();
+        }
+    }
+    else
+    {
+        if(get_nandemu() == 2)
+        {
+            if (opendir(check_path("sd1:/apps/NANDEmu-Boot").c_str()) != NULL)
+            {
+                xprintf("Booting NANDEmu from SD\n");
+                LoadHomebrew ("sd1:/apps/NANDEmu-Boot/boot.dol");
+                BootHomebrew ();
+            }
+            else if (opendir(check_path("usb1:/apps/NANDEmu-Boot").c_str()) != NULL)
+            {
+                xprintf("Booting NANDEmu from USB\n");
+                LoadHomebrew ("usb1:/apps/NANDEmu-Boot/boot.dol");
+                BootHomebrew ();
+            }
+        }
+        else if(get_priiloader() == 2)
+        {
+            xprintf("Entering magic key\n");
+            *(vu32*)0x8132FFFB = 0x4461636f;
+            DCFlushRange((void*)0x8132FFFB, 4);
+            xprintf("Starting Priiloader");
+            SYS_ResetSystem(SYS_RETURNTOMENU, 0, 0);
+        }
+        else if(restarthbf)
+        {
+            xprintf("Relaunching myself\n");
+            WII_LaunchTitle(0x0001000154484246);
+        }
+        else if(updatehbf)
+        {
+            xprintf("Setting force_reload to NORELOAD\n");
+            Settings.force_reload = "NORELOAD";
+            xprintf("Loading boot.dol from online update\n");
+            LoadHomebrew ((Settings.device_dat + ":/apps/HomebrewFilter/boot.dol").c_str());
+            BootHomebrew();
+        }
+        else if(gosegui)
+        {
+            xprintf("Launching Settings Editor GUI\n");
+            LoadHomebrew(segui_loc);
+            BootHomebrew();
+        }
+        else if(goneek2o)
+        {
+            xprintf("Entering neek2o\n");
+            boot_neek2o();
+            SYS_ResetSystem(SYS_RETURNTOMENU, 0, 0);
+        }
+        else if(gorealnand)
+        {
+            xprintf("Entering real NAND\n");
             SYS_ResetSystem(SYS_RESTART, 0, 0);
         }
-		else if(!check_uneek_fs())
-		{
-			xprintf("Load BootMii (IOS)\n");
-			IOS_ReloadIOS(254);
-		}
-		else
-		{
-			//we can't launch bootmii from within neek2o I assume
-			//so we should do something else
-			xprintf("We're in neek2o, not entering BootMii, but SystemMenu\n");
-			SYS_ResetSystem(SYS_RETURNTOMENU, 0, 0);
-		}
-	}
-
-	if(get_nandemu() == 2)
-	{
-		if (opendir(check_path("sd1:/apps/NANDEmu-Boot").c_str()) != NULL)
-		{
-			xprintf("Booting NANDEmu from SD\n");
-			LoadHomebrew ("sd1:/apps/NANDEmu-Boot/boot.dol");
-			BootHomebrew ();
-		}
-		else if (opendir(check_path("usb1:/apps/NANDEmu-Boot").c_str()) != NULL)
-		{
-			xprintf("Booting NANDEmu from USB\n");
-			LoadHomebrew ("usb1:/apps/NANDEmu-Boot/boot.dol");
-			BootHomebrew ();
-		}
-	}
-
-	if(get_priiloader() == 2)
-	{
-		xprintf("Entering magic key\n");
-		*(vu32*)0x8132FFFB = 0x4461636f;
-		DCFlushRange((void*)0x8132FFFB, 4);
-		xprintf("Starting Priiloader");
-		SYS_ResetSystem(SYS_RETURNTOMENU, 0, 0);
-	}
-
-	if(restarthbf)
-	{
-		xprintf("Relaunching myself\n");
-		WII_LaunchTitle(0x0001000154484246);
-	}
-
-	if(updatehbf)
-	{
-		xprintf("Setting force_reload to NORELOAD\n");
-		Settings.force_reload = "NORELOAD";
-		xprintf("Loading boot.dol from online update\n");
-		LoadHomebrew ((Settings.device_dat + ":/apps/HomebrewFilter/boot.dol").c_str());
-		BootHomebrew();
-	}
-
-	if(gosegui)
-	{
-		xprintf("Launching Settings Editor GUI\n");
-		LoadHomebrew(segui_loc);
-		BootHomebrew();
-	}
-
-	if(goneek2o)
-	{
-		xprintf("Entering neek2o\n");
-		boot_neek2o();
-		SYS_ResetSystem(SYS_RETURNTOMENU, 0, 0);
-	}
-
-	if(gorealnand)
-	{
-		xprintf("Entering real NAND\n");
-		SYS_ResetSystem(SYS_RESTART, 0, 0);
-	}
-
-	if(PowerOff == SYS_RETURNTOMENU)
-	{
-		xprintf("Entering magic key\n");
-		*(vu32*)0x8132FFFB = 0x50756E65;
-		DCFlushRange((void*)0x8132FFFB, 4);
-		xprintf("Entering SystemMenu\n");
-		SYS_ResetSystem(SYS_RETURNTOMENU, 0, 0);
-	}
-	else if(PowerOff != -1)
-	{
-		xprintf("Full Stop!\n");
-		SYS_ResetSystem(PowerOff, 0, 0);
-	}
+        else if(PowerOff == SYS_RETURNTOMENU)
+        {
+            xprintf("Entering magic key\n");
+            *(vu32*)0x8132FFFB = 0x50756E65;
+            DCFlushRange((void*)0x8132FFFB, 4);
+            xprintf("Entering SystemMenu\n");
+            SYS_ResetSystem(SYS_RETURNTOMENU, 0, 0);
+        }
+        else if(PowerOff != -1)
+        {
+            xprintf("Full Stop!\n");
+            SYS_ResetSystem(PowerOff, 0, 0);
+        }
+        else if(get_bootmii() != 0)
+        {
+            if(Options.bootmii_boot2)
+            {
+                xprintf("Load BootMii (Boot2)\n");
+                SYS_ResetSystem(SYS_RESTART, 0, 0);
+            }
+            else if(!check_uneek_fs())
+            {
+                xprintf("Load BootMii (IOS)\n");
+                IOS_ReloadIOS(254);
+            }
+            else
+            {
+                //we can't launch bootmii from within neek2o I assume
+                //so we should do something else
+                xprintf("We're in neek2o, not entering BootMii, but SystemMenu\n");
+                SYS_ResetSystem(SYS_RETURNTOMENU, 0, 0);
+            }
+        }
+    }
 
 	return 0;
 }