mirrors/rufus
1
0
Fork 0
mirror of https://github.com/pbatard/rufus.git synced 2025-05-25 20:24:26 -04:00
Code Issues Projects Releases Packages Wiki Activity

[iso] improve handling of image size

Browse source 
* Don't use the projected size where the actual image size should be used
* Also fix an issue with the projected size computation
This commit is contained in:
Pete Batard 2017-05-01 16:22:34 +01:00
parent 0c76dbf075
commit 30137de7cb
7 changed files with 20 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/rufus.c
View file

@ -972,7 +972,7 @@ static void DisplayISOProps(void)
int i;
uprintf("ISO label: '%s'", img_report.label);
uprintf(" Size: %s", SizeToHumanReadable( img_report.projected_size, FALSE, FALSE));
uprintf(" Size: %s (Projected)", SizeToHumanReadable(img_report.projected_size, FALSE, FALSE));
PRINT_ISO_PROP(img_report.has_4GB_file, " Has a >4GB file");
PRINT_ISO_PROP(img_report.has_long_filename, " Has a >64 chars filename");
PRINT_ISO_PROP(HAS_SYSLINUX(img_report), " Uses: Syslinux/Isolinux v%s", img_report.sl_version_str);
@ -1015,9 +1015,11 @@ DWORD WINAPI ISOScanThread(LPVOID param)
PrintInfoDebug(0, MSG_202);
user_notified = FALSE;
EnableControls(FALSE);
memset(&img_report, 0, sizeof(img_report));
img_report.is_iso = (BOOLEAN)ExtractISO(image_path, "", TRUE);
img_report.is_bootable_img = (BOOLEAN)IsBootableImage(image_path);
if (!img_report.is_iso && !img_report.is_bootable_img) {
if ((img_report.image_size == 0) || (!img_report.is_iso && !img_report.is_bootable_img)) {
// Failed to scan image
SendMessage(hMainDialog, UM_PROGRESS_EXIT, 0, 0);
PrintInfoDebug(0, MSG_203);