Skip to content

Fixed a regression in the Volume display name function. #806

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SergeySlice merged 1 commit into from
Feb 25, 2026
+6 −2
Merged

Fixed a regression in the Volume display name function. #806

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion rEFIt_UEFI/Platform/Volume.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ class REFIT_VOLUME {

const XStringW getVolLabelOrOSXVolumeNameOrVolName() {
if ( VolLabel.notEmpty() ) return VolLabel;
// if ( osxVolumeName.notEmpty() ) return osxVolumeName; // not assigned
if ( osxVolumeName.notEmpty() ) return osxVolumeName;
return VolName;
}
};
Expand Down
6 changes: 5 additions & 1 deletion rEFIt_UEFI/entry_scan/loader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -466,6 +466,7 @@ STATIC XBool isFirstRootUUID(REFIT_VOLUME *Volume) {
}

// Set Entry->VolName to .disk_label.contentDetails if it exists
// Set Entry/Volume display name to .disk_label.contentDetails if it exists
STATIC EFI_STATUS GetOSXVolumeName(LOADER_ENTRY *Entry) {
EFI_STATUS Status = EFI_NOT_FOUND;
CONST CHAR16 *targetNameFile =
Expand All @@ -476,7 +477,10 @@ STATIC EFI_STATUS GetOSXVolumeName(LOADER_ENTRY *Entry) {
Status = egLoadFile(Entry->Volume->RootDir, targetNameFile,
(UINT8 **)&fileBuffer, &fileLen);
if (!EFI_ERROR(Status)) {
Entry->DisplayedVolName.strncpy(fileBuffer, fileLen);
if (Entry->DisplayedVolName.isEmpty()) {
Entry->DisplayedVolName.strncpy(fileBuffer, fileLen);
}
Entry->Volume->osxVolumeName.strncpy(fileBuffer, fileLen);
DBG("Created name:%ls\n", Entry->DisplayedVolName.wc_str());

FreePool(fileBuffer);
Expand Down
Loading