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

View File

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

View File

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