Upstream/CloverBootloader
1
0
Fork 0
mirror of https://github.com/CloverHackyColor/CloverBootloader.git synced 2024-12-25 16:37:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/CloverHackyColor/CloverBootloader

Browse Source
This commit is contained in:
Sergey Isakov 2020-04-05 10:20:14 +03:00
commit 94d8d05c39
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
rEFIt_UEFI/libeg/XImage.cpp
View File

@ -343,6 +343,7 @@ EFI_STATUS XImage::FromPNG(const UINT8 * Data, UINTN Length)
if (Error != 0 && Error != 28) { if (Error != 0 && Error != 28) {
return EFI_NOT_FOUND; return EFI_NOT_FOUND;
} }
if ( !PixelPtr ) return EFI_UNSUPPORTED; // It's possible to get error 28 and PixelPtr == NULL
setSizeInPixels(Width, Height); setSizeInPixels(Width, Height);
//now we have a new pointer and want to move data //now we have a new pointer and want to move data
INTN NewLength = Width * Height * sizeof(EFI_GRAPHICS_OUTPUT_BLT_PIXEL); INTN NewLength = Width * Height * sizeof(EFI_GRAPHICS_OUTPUT_BLT_PIXEL);

11
rEFIt_UEFI/refit/menu.cpp
View File

@ -786,12 +786,15 @@ VOID ApplyInputs(VOID)
i++; //3 i++; //3
if (InputItems[i].Valid) { if (InputItems[i].Valid) {
#if USE_XTHEME #if USE_XTHEME
if (GlobalConfig.Theme) {
FreePool(GlobalConfig.Theme);
}
if (OldChosenTheme == 0xFFFF) { if (OldChosenTheme == 0xFFFF) {
ThemeX.Theme.takeValueFrom("embedded"); GlobalConfig.Theme = PoolPrint(L"embedded");
} else { } else {
ThemeX.Theme.takeValueFrom(ThemesList[OldChosenTheme]); GlobalConfig.Theme = PoolPrint(L"%s", ThemesList[OldChosenTheme]);
ThemeX.DarkEmbedded = FALSE; //ThemeX.DarkEmbedded = FALSE; Don't know what to do
ThemeX.Font = FONT_ALFA; //ThemeX.Font = FONT_ALFA;
} }
GlobalConfig.Theme = EfiStrDuplicate(ThemeX.Theme.wc_str()); GlobalConfig.Theme = EfiStrDuplicate(ThemeX.Theme.wc_str());
#else #else