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

* Calms down a superfluous GCC 2 warning.

Browse Source 
* Minor cleanup.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@21468 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2007-06-20 00:51:20 +00:00
parent de83ade240
commit 8ba7bc695a
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/boot/loader/menu.cpp
+8 -5
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright 2003-2006, Axel Dörfler, [email protected]. All rights reserved. * Copyright 2003-2007, Axel Dörfler, [email protected]. All rights reserved.
* Distributed under the terms of the MIT License. * Distributed under the terms of the MIT License.
*/ */
@@ -407,7 +407,8 @@ add_boot_volume_menu(Directory *bootVolume)
menu->AddSeparatorItem(); menu->AddSeparatorItem();
menu->AddItem(item = new(nothrow) MenuItem("Rescan volumes")); menu->AddItem(item = new(nothrow) MenuItem("Rescan volumes"));
item->SetHelpText("Please insert a Haiku CD-ROM or attach a USB disk - depending on your system, you can then boot from them."); item->SetHelpText("Please insert a Haiku CD-ROM or attach a USB disk - "
"depending on your system, you can then boot from them.");
item->SetType(MENU_ITEM_NO_CHOICE); item->SetType(MENU_ITEM_NO_CHOICE);
if (count == 0) if (count == 0)
item->Select(true); item->Select(true);
@@ -492,14 +493,16 @@ status_t
user_menu(Directory **_bootVolume) user_menu(Directory **_bootVolume)
{ {
Menu *menu = new(nothrow) Menu(MAIN_MENU); Menu *menu = new(nothrow) Menu(MAIN_MENU);
Menu *safeModeMenu; Menu *safeModeMenu = NULL;
MenuItem *item; MenuItem *item;
// Add boot volume // Add boot volume
menu->AddItem(item = new(nothrow) MenuItem("Select boot volume", add_boot_volume_menu(*_bootVolume))); menu->AddItem(item = new(nothrow) MenuItem("Select boot volume",
add_boot_volume_menu(*_bootVolume)));
// Add safe mode // Add safe mode
menu->AddItem(item = new(nothrow) MenuItem("Select safe mode options", safeModeMenu = add_safe_mode_menu())); menu->AddItem(item = new(nothrow) MenuItem("Select safe mode options",
safeModeMenu = add_safe_mode_menu()));
// Add platform dependent menus // Add platform dependent menus
platform_add_menus(menu); platform_add_menus(menu);