From 80566e080f1ac673118d3373deaa3365dbab73dd Mon Sep 17 00:00:00 2001
From: Christopher Roy Bratusek <nano@tuxfamily.org>
Date: Sun, 8 Apr 2012 19:51:01 +0200
Subject: [PATCH] don't show uniiloader entry when in emulated NAND

---
 source/Prompts/prompt_loader.cpp | 41 ++++++++++++++++++++++++--------
 updates                          |  3 ++-
 2 files changed, 33 insertions(+), 11 deletions(-)

diff --git a/source/Prompts/prompt_loader.cpp b/source/Prompts/prompt_loader.cpp
index 9514b7e..763b486 100644
--- a/source/Prompts/prompt_loader.cpp
+++ b/source/Prompts/prompt_loader.cpp
@@ -23,6 +23,7 @@ loaderPrompt()
 {
 	bool stop = false;
 	int menu = 0;
+
 	listIOS();
 
 	if( ! priicheck )
@@ -75,8 +76,6 @@ loaderPrompt()
 	GuiButton neek2o(btn.GetWidth(), btn.GetHeight());
 	neek2o.SetAlignment(ALIGN_CENTRE, ALIGN_TOP);
 	neek2o.SetPosition(0, 90);
-	if(get_nandemu())
-		neek2o.SetPosition(0, 140);
 	neek2o.SetLabel(&neek2oTxt);
 	neek2o.SetImage(&neek2oImg);
 	neek2o.SetImageOver(&neek2oImgOver);
@@ -86,10 +85,6 @@ loaderPrompt()
 	GuiButton priiloader(btn.GetWidth(), btn.GetHeight());
 	priiloader.SetAlignment(ALIGN_CENTRE, ALIGN_TOP);
 	priiloader.SetPosition(0, 90);
-	if(get_nandemu() && check_neek2o())
-		priiloader.SetPosition(0, 190);
-	else if (get_nandemu() || check_neek2o())
-		priiloader.SetPosition(0, 140);
 	priiloader.SetLabel(&priiloaderTxt);
 	priiloader.SetImage(&priiloaderImg);
 	priiloader.SetImageOver(&priiloaderImgOver);
@@ -110,10 +105,36 @@ loaderPrompt()
 
 	promptWindow.Append(&dialogBoxImg);
 	promptWindow.Append(&titleTxt);
-	if(get_nandemu() && ! check_uneek_fs())
-		promptWindow.Append(&nandemu);
-	if(check_neek2o())
-		promptWindow.Append(&neek2o);
+
+	if(!check_uneek_fs())
+	{
+
+		if(get_nandemu() && check_neek2o())
+		{
+			nandemu.SetPosition(0, 90);
+			promptWindow.Append(&nandemu);
+
+			neek2o.SetPosition(0, 140);
+			promptWindow.Append(&neek2o);
+
+			priiloader.SetPosition(0, 190);
+		}
+		else if (get_nandemu())
+		{
+			nandemu.SetPosition(0, 90);
+			promptWindow.Append(&nandemu);
+
+			priiloader.SetPosition(0, 140);
+		}
+		else if(check_neek2o())
+		{
+			neek2o.SetPosition(0, 90);
+			promptWindow.Append(&neek2o);
+
+			priiloader.SetPosition(0, 140);
+		}
+	}
+
 	if(get_priiloader() == 1)
 		promptWindow.Append(&priiloader);
 	promptWindow.Append(&back);
diff --git a/updates b/updates
index 873edbe..626ef59 100644
--- a/updates
+++ b/updates
@@ -19,7 +19,8 @@
 - BUGFIX: only show 'launch priiloader' in external loaders prompt,
           if priiloader is really installed
 - external loaders menu now allows to boot into neek2o
-  using overjoy's `nswitch' code
+  using overjoy's `nswitch' code. uniiloader entry no
+  longer shown when in emulated NAND
 - changed loading address from 0x81230000 to 0x81330000
 - removed all sound related code
 - support for neek2o [obcd]