Code cleanup & consolidation of icon code; minor patch to ext4fs driver

[refind] / refind / lib.c

diff --git a/refind/lib.c b/refind/lib.c
index 1930e079e63b4b8f2d06da07537228c7a50ccd6a..bf2c2ef27b38e60f79a4840f5cf5abc7d930c124 100644 (file)
--- a/refind/lib.c
+++ b/refind/lib.c
@@ -852,9 +852,9 @@ VOID ScanVolume(REFIT_VOLUME *Volume)
 
     // get custom volume icon if present
     if (!Volume->VolBadgeImage)
-       Volume->VolBadgeImage = LoadIcns(Volume->RootDir, VOLUME_BADGE_NAMES, 32);
+       Volume->VolBadgeImage = egLoadIconAnyType(Volume->RootDir, L"", L".VolumeBadge", 32);
     if (!Volume->VolIconImage)
-       Volume->VolIconImage = LoadIcns(Volume->RootDir, VOLUME_ICON_NAMES, 128);
+       Volume->VolIconImage = egLoadIconAnyType(Volume->RootDir, L"", L".VolumeIcon", 128);
 } // ScanVolume()
 
 static VOID ScanExtendedPartition(REFIT_VOLUME *WholeDiskVolume, MBR_PARTITION_INFO *MbrEntry)