From fe3241d092809d55ab224963ba50cfa969431146 Mon Sep 17 00:00:00 2001
From: Pete Batard <pete@akeo.ie>
Date: Fri, 11 Dec 2015 23:17:12 +0000
Subject: [PATCH] [core] ensure that drive zeroing is reset on user cancel

* Closes #651
---
 src/rufus.c  |  6 +++++-
 src/rufus.rc | 10 +++++-----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/rufus.c b/src/rufus.c
index 25f8f437..ef4db03c 100644
--- a/src/rufus.c
+++ b/src/rufus.c
@@ -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)) {
diff --git a/src/rufus.rc b/src/rufus.rc
index 2f40c16d..636a7e91 100644
--- a/src/rufus.rc
+++ b/src/rufus.rc
@@ -32,7 +32,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
-CAPTION "Rufus 2.6.816"
+CAPTION "Rufus 2.6.817"
 FONT 8, "Segoe UI Symbol", 400, 0, 0x0
 BEGIN
     LTEXT           "Device",IDS_DEVICE_TXT,9,6,200,8
@@ -319,8 +319,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,6,816,0
- PRODUCTVERSION 2,6,816,0
+ FILEVERSION 2,6,817,0
+ PRODUCTVERSION 2,6,817,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -337,13 +337,13 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Akeo Consulting (http://akeo.ie)"
             VALUE "FileDescription", "Rufus"
-            VALUE "FileVersion", "2.6.816"
+            VALUE "FileVersion", "2.6.817"
             VALUE "InternalName", "Rufus"
             VALUE "LegalCopyright", "© 2011-2015 Pete Batard (GPL v3)"
             VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html"
             VALUE "OriginalFilename", "rufus.exe"
             VALUE "ProductName", "Rufus"
-            VALUE "ProductVersion", "2.6.816"
+            VALUE "ProductVersion", "2.6.817"
         END
     END
     BLOCK "VarFileInfo"