mirrors/rufus
1
0
Fork 0
mirror of https://github.com/pbatard/rufus.git synced 2025-05-28 13:44:15 -04:00
Code Issues Projects Releases Packages Wiki Activity

[core] fix population of label and filesystem for ISOHybrid images

Browse source 
* Also fix a misleading error about incompatible file system for pure EFI images (such as Acronis 2016)
* Closes #588
This commit is contained in:
Pete Batard 2015-09-02 23:34:20 +01:00
parent 5024e7f65e
commit 49e54904c2
2 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/rufus.c
View file

@ -1022,6 +1022,7 @@ static void DisplayISOProps(void)
DWORD WINAPI ISOScanThread(LPVOID param)
{
int i;
// BOOL is_iso, is_img;
if (image_path == NULL)
goto out;
@ -1064,7 +1065,7 @@ DWORD WINAPI ISOScanThread(LPVOID param)
} else {
// Enable bootable and set Target System and FS accordingly
CheckDlgButton(hMainDialog, IDC_BOOT, BST_CHECKED);
if (!img_report.is_bootable_img) {
if (img_report.is_iso) {
SetTargetSystem();
SetFSFromISO();
SetMBRProps();
@ -1331,7 +1332,7 @@ static BOOL BootCheck(void)
return FALSE;
}
} else if ( ((fs == FS_NTFS) && (!img_report.has_bootmgr) && (!IS_WINPE(img_report.winpe)) && (!IS_GRUB(img_report)))
|| ((IS_FAT(fs)) && (!HAS_SYSLINUX(img_report)) && (!allow_dual_uefi_bios) &&
|| ((IS_FAT(fs)) && (!HAS_SYSLINUX(img_report)) && (!allow_dual_uefi_bios) && (!img_report.has_efi) &&
(!IS_REACTOS(img_report)) && (!img_report.has_kolibrios) && (!IS_GRUB(img_report))) ) {
// Incompatible FS and ISO
MessageBoxU(hMainDialog, lmprintf(MSG_096), lmprintf(MSG_092), MB_OK|MB_ICONERROR|MB_IS_RTL);