From ccfc7bea502f61c942a39ef40ad783960f70f2d3 Mon Sep 17 00:00:00 2001
From: Ingo Weinhold <ingo_weinhold@gmx.de>
Date: Sat, 30 Nov 2013 19:40:32 +0100
Subject: [PATCH] boot loader: blacklist menu: Add "Return to ..." item

---
 src/system/boot/loader/menu.cpp | 37 ++++++++++++++++++++-------------
 1 file changed, 22 insertions(+), 15 deletions(-)

diff --git a/src/system/boot/loader/menu.cpp b/src/system/boot/loader/menu.cpp
index b5dbcc65be..96fbbeccb1 100644
--- a/src/system/boot/loader/menu.cpp
+++ b/src/system/boot/loader/menu.cpp
@@ -622,26 +622,29 @@ public:
 	{
 		_DeleteItems();
 
-		if (fDirectory == NULL)
-			return;
+		if (fDirectory != NULL) {
+			void* cookie;
+			if (fDirectory->Open(&cookie, O_RDONLY) == B_OK) {
+				Node* node;
+				while (fDirectory->GetNextNode(cookie, &node) == B_OK) {
+					BlacklistMenuItem* item = _CreateItem(node);
+					node->Release();
+					if (item == NULL)
+						break;
 
-		void* cookie;
-		if (fDirectory->Open(&cookie, O_RDONLY) == B_OK) {
-			Node* node;
-			while (fDirectory->GetNextNode(cookie, &node) == B_OK) {
-				BlacklistMenuItem* item = _CreateItem(node);
-				node->Release();
-				if (item == NULL)
-					break;
+					AddItem(item);
 
-				AddItem(item);
-
-				item->UpdateBlacklisted();
+					item->UpdateBlacklisted();
+				}
+				fDirectory->Close(cookie);
 			}
-			fDirectory->Close(cookie);
+
+			SortItems(&BlacklistMenuItem::Less);
 		}
 
-		SortItems(&BlacklistMenuItem::Less);
+		if (CountItems() > 0)
+			AddSeparatorItem();
+		AddItem(new(nothrow) MenuItem("Return to parent directory"));
 	}
 
 	virtual void Exited()
@@ -725,6 +728,10 @@ public:
 			SetDirectory(NULL);
 
 		BlacklistMenu::Entered();
+
+		// rename last item
+		if (MenuItem* item = ItemAt(CountItems() - 1))
+			item->SetLabel("Return to safe mode menu");
 	}
 
 	virtual void Exited()