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

[core] ensure that drive zeroing is reset on user cancel

Browse source 
* Closes #651
This commit is contained in:
Pete Batard 2015-12-11 23:17:12 +00:00
parent d048cc108f
commit fe3241d092
2 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/rufus.c
View file

@ -2501,11 +2501,13 @@ static INT_PTR CALLBACK MainCallback(HWND hDlg, UINT message, WPARAM wParam, LPA
if (MessageBoxExU(hMainDialog, lmprintf(MSG_003, tmp),
APPLICATION_NAME, MB_OKCANCEL|MB_ICONWARNING|MB_IS_RTL, selected_langid) == IDCANCEL) {
format_op_in_progress = FALSE;
zero_drive = FALSE;
break;
}
if ((SelectedDrive.nPartitions > 1) && (MessageBoxExU(hMainDialog, lmprintf(MSG_093),
lmprintf(MSG_094), MB_OKCANCEL|MB_ICONWARNING|MB_IS_RTL, selected_langid) == IDCANCEL)) {
format_op_in_progress = FALSE;
zero_drive = FALSE;
break;
}
if ((!zero_drive) && (IsChecked(IDC_BOOT)) && (SelectedDrive.Geometry.BytesPerSector != 512) &&
@ -2532,8 +2534,10 @@ static INT_PTR CALLBACK MainCallback(HWND hDlg, UINT message, WPARAM wParam, LPA
SendMessageA(hStatus, SB_SETTEXTA, SBT_OWNERDRAW | SB_SECTION_RIGHT, (LPARAM)szTimer);
SetTimer(hMainDialog, TID_APP_TIMER, 1000, ClockTimer);
}
if (format_thid == NULL)
if (format_thid == NULL) {
format_op_in_progress = FALSE;
zero_drive = FALSE;
}
break;
case IDC_HASH:
if ((format_thid == NULL) && (image_path != NULL)) {