diff options
| author | Ryan Harkin <ryan.harkin@linaro.org> | 2013-04-18 17:13:39 +0100 |
|---|---|---|
| committer | Ryan Harkin <ryan.harkin@linaro.org> | 2013-04-18 17:13:39 +0100 |
| commit | 4cbfd417d24602d2d9c05cc5693a6e6087d1c96d (patch) | |
| tree | ab092ce095acd67f57473d03148d2bcd848768ea /IntelFrameworkModulePkg/Universal | |
| parent | 17ffede3b6118ef6ef73c531e888b89a44295689 (diff) | |
| parent | d4cb39392edddd6857a8d54223d0ad3d80a88d4e (diff) | |
Merge branch 'linaro-tracking-2013.04' into linaro-releaselinaro-uefi-2013.04
Conflicts:
PandaBoardPkg/Include/PandaBoard.h
PandaBoardPkg/Library/PandaBoardLib/Clock.c
PandaBoardPkg/Library/PandaBoardLib/PadConfiguration.c
Signed-off-by: Ryan Harkin <ryan.harkin@linaro.org>
Diffstat (limited to 'IntelFrameworkModulePkg/Universal')
| -rw-r--r-- | IntelFrameworkModulePkg/Universal/BdsDxe/FrontPage.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPage.c b/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPage.c index da0e17b38d..432b22469e 100644 --- a/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPage.c +++ b/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPage.c @@ -399,10 +399,10 @@ InitializeFrontPage ( CurrentLang = GetEfiGlobalVariable (L"PlatformLang");
- if (gFrontPagePrivate.LanguageToken == NULL) {
- //
- // Get Support language list from variable.
- //
+ //
+ // Get Support language list from variable.
+ //
+ if (mLanguageString == NULL){
mLanguageString = GetEfiGlobalVariable (L"PlatformLangCodes");
if (mLanguageString == NULL) {
mLanguageString = AllocateCopyPool (
@@ -411,7 +411,9 @@ InitializeFrontPage ( );
ASSERT (mLanguageString != NULL);
}
+ }
+ if (gFrontPagePrivate.LanguageToken == NULL) {
//
// Count the language list number.
//
@@ -1223,6 +1225,7 @@ PlatformBdsEnterFrontPage ( if (mLanguageString != NULL) {
FreePool (mLanguageString);
+ mLanguageString = NULL;
}
//
//Will leave browser, check any reset required change is applied? if yes, reset system
|