Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-27 01:24:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

bug fix: use the requested default os when timeout is 0 instead of defaulting to the first OS in the list.

Browse source 
svn path=/trunk/; revision=13344
This commit is contained in:
Royce Mitchell III 2005-01-28 06:07:48 +00:00
parent 4b5d785258
commit d2f23650e6
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
reactos/boot/freeldr/freeldr/bootmgr.c
View file

@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include <freeldr.h>
#include <rtl.h>
#include <fs.h>
@ -70,14 +70,14 @@ VOID RunLoader(VOID)
MachConsGetCh();
return;
}
if (!InitOperatingSystemList(&OperatingSystemSectionNames, &OperatingSystemDisplayNames, &OperatingSystemCount))
{
UiMessageBox("Press ENTER to reboot.\n");
goto reboot;
}
if (OperatingSystemCount == 0)
{
UiMessageBox("There were no operating systems listed in freeldr.ini.\nPress ENTER to reboot.");
@ -85,7 +85,7 @@ VOID RunLoader(VOID)
}
DefaultOperatingSystem = GetDefaultOperatingSystem(OperatingSystemSectionNames, OperatingSystemCount);
//
// Find all the message box settings and run them
//
@ -93,12 +93,13 @@ VOID RunLoader(VOID)
for (;;)
{
/* If Timeout is 0, don't even bother loading any gui */
if (!UserInterfaceUp) {
SelectedOperatingSystem = DefaultOperatingSystem;
goto NoGui;
}
// Redraw the backdrop
UiDrawBackdrop();
@ -108,10 +109,9 @@ VOID RunLoader(VOID)
UiMessageBox("Press ENTER to reboot.\n");
goto reboot;
}
NoGui:
TimeOut = -1;
DefaultOperatingSystem = SelectedOperatingSystem;
// Try to open the operating system section in the .ini file
if (!IniOpenSection(OperatingSystemSectionNames[SelectedOperatingSystem], &SectionId))
@ -153,7 +153,7 @@ NoGui:
}
}
reboot:
UiUnInitialize("Rebooting...");
return;