i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

boot loader: blacklist menu: Add "Return to ..." item

Browse Source
This commit is contained in:
Ingo Weinhold
2013-11-30 19:56:13 +01:00
parent cbfc38c62d
commit ccfc7bea50
1 changed files with 22 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/boot/loader/menu.cpp
+10 -3
View File
@@ -622,9 +622,7 @@ public:
{ {
_DeleteItems(); _DeleteItems();
if (fDirectory == NULL) if (fDirectory != NULL) {
return;
void* cookie; void* cookie;
if (fDirectory->Open(&cookie, O_RDONLY) == B_OK) { if (fDirectory->Open(&cookie, O_RDONLY) == B_OK) {
Node* node; Node* node;
@@ -644,6 +642,11 @@ public:
SortItems(&BlacklistMenuItem::Less); SortItems(&BlacklistMenuItem::Less);
} }
if (CountItems() > 0)
AddSeparatorItem();
AddItem(new(nothrow) MenuItem("Return to parent directory"));
}
virtual void Exited() virtual void Exited()
{ {
_DeleteItems(); _DeleteItems();
@@ -725,6 +728,10 @@ public:
SetDirectory(NULL); SetDirectory(NULL);
BlacklistMenu::Entered(); BlacklistMenu::Entered();
// rename last item
if (MenuItem* item = ItemAt(CountItems() - 1))
item->SetLabel("Return to safe mode menu");
} }
virtual void Exited() virtual void Exited()