nerd/rufus
1
1
Fork 0
mirror of https://github.com/pbatard/rufus.git synced 2024-08-14 23:57:05 +00:00
Code Issues 1 Projects Releases Wiki Activity

[misc] don't download BIOS-related files if selected target isn't BIOS

Browse source 
* Part of #799
* Also set rufus-next to 2.11
This commit is contained in:
Pete Batard 2016-08-08 13:46:50 +02:00
parent e7578bc12d
commit ab44cde7ac
4 changed files with 24 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/rufus.c
View file

@ -1328,6 +1328,10 @@ static BOOL BootCheck(void)
return FALSE;
}
// If the selected target doesn't include include BIOS, skip file downloads for GRUB/Syslinux
if (tt != TT_BIOS)
goto uefi_target;
if ((img_report.has_grub2) && (img_report.grub2_version[0] != 0) &&
(strcmp(img_report.grub2_version, GRUB2_PACKAGE_VERSION) != 0)) {
// We may have to download a different Grub2 version if we can find one
@ -1545,7 +1549,10 @@ static BOOL BootCheck(void)
return FALSE;
}
}
} else if (bt == BT_UEFI_NTFS) {
}
uefi_target:
if (bt == BT_UEFI_NTFS) {
fs = (int)ComboBox_GetItemData(hFileSystem, ComboBox_GetCurSel(hFileSystem));
if (fs != FS_NTFS) {
MessageBoxExU(hMainDialog, lmprintf(MSG_097, "UEFI:NTFS"), lmprintf(MSG_092), MB_OK|MB_ICONERROR|MB_IS_RTL, selected_langid);

10
src/rufus.rc
View file

@ -33,7 +33,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
IDD_DIALOG DIALOGEX 12, 12, 242, 376
STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
EXSTYLE WS_EX_ACCEPTFILES
CAPTION "Rufus 2.10.982"
CAPTION "Rufus 2.11.983"
FONT 8, "Segoe UI Symbol", 400, 0, 0x0
BEGIN
LTEXT "Device",IDS_DEVICE_TXT,9,6,200,8
@ -320,8 +320,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 2,10,982,0
PRODUCTVERSION 2,10,982,0
FILEVERSION 2,11,983,0
PRODUCTVERSION 2,11,983,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@ -338,13 +338,13 @@ BEGIN
BEGIN
VALUE "CompanyName", "Akeo Consulting (http://akeo.ie)"
VALUE "FileDescription", "Rufus"
VALUE "FileVersion", "2.10.982"
VALUE "FileVersion", "2.11.983"
VALUE "InternalName", "Rufus"
VALUE "LegalCopyright", "© 2011-2016 Pete Batard (GPL v3)"
VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html"
VALUE "OriginalFilename", "rufus.exe"
VALUE "ProductName", "Rufus"
VALUE "ProductVersion", "2.10.982"
VALUE "ProductVersion", "2.11.983"
END
END
BLOCK "VarFileInfo"