diff options
| author | jcarsey <jcarsey@6f19259b-4bc3-4df7-8a09-765794883524> | 2011-04-15 18:20:40 +0000 |
|---|---|---|
| committer | jcarsey <jcarsey@6f19259b-4bc3-4df7-8a09-765794883524> | 2011-04-15 18:20:40 +0000 |
| commit | a49f6a2f7e0d0141519c136905ce70038573ce40 (patch) | |
| tree | 638c8fdf8a2940c5a7eeb606fbc6372389ceafdf /ShellPkg/Library | |
| parent | f6ea51e5ac7195f550cdabacc088597d3f63b6e2 (diff) | |
| download | edk2-platforms-a49f6a2f7e0d0141519c136905ce70038573ce40.tar.xz | |
fix for word wrapping.
fix for SimpleTextInEx callbacks.
remove an ASSERT.
fix for -noconsolein parameter.
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@11544 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'ShellPkg/Library')
| -rw-r--r-- | ShellPkg/Library/UefiShellLevel3CommandsLib/Pause.c | 3 | ||||
| -rw-r--r-- | ShellPkg/Library/UefiShellLevel3CommandsLib/UefiShellLevel3CommandsLib.uni | bin | 42494 -> 42500 bytes |
2 files changed, 1 insertions, 2 deletions
diff --git a/ShellPkg/Library/UefiShellLevel3CommandsLib/Pause.c b/ShellPkg/Library/UefiShellLevel3CommandsLib/Pause.c index facacaac7d..d6ed793579 100644 --- a/ShellPkg/Library/UefiShellLevel3CommandsLib/Pause.c +++ b/ShellPkg/Library/UefiShellLevel3CommandsLib/Pause.c @@ -82,9 +82,8 @@ ShellCommandRunPause ( } else {
Status = ShellPromptForResponse(ShellPromptResponseTypeQuitContinue, NULL, (VOID**)&Resp);
}
- ASSERT_EFI_ERROR(Status);
- if (Resp == NULL || *Resp == ShellPromptResponseQuit) {
+ if (EFI_ERROR(Status) || Resp == NULL || *Resp == ShellPromptResponseQuit) {
ShellCommandRegisterExit(TRUE);
ShellStatus = SHELL_ABORTED;
}
diff --git a/ShellPkg/Library/UefiShellLevel3CommandsLib/UefiShellLevel3CommandsLib.uni b/ShellPkg/Library/UefiShellLevel3CommandsLib/UefiShellLevel3CommandsLib.uni Binary files differindex 346b464e82..a50aa28d26 100644 --- a/ShellPkg/Library/UefiShellLevel3CommandsLib/UefiShellLevel3CommandsLib.uni +++ b/ShellPkg/Library/UefiShellLevel3CommandsLib/UefiShellLevel3CommandsLib.uni |