From 555397403ade996940ab4a2c5f5c96afbad63f37 Mon Sep 17 00:00:00 2001
From: Pete Batard <pete@akeo.ie>
Date: Mon, 11 Feb 2019 16:10:27 +0100
Subject: [PATCH] [ui] fix quickformat option being ignored when unchecked

---
 src/rufus.c  | 12 ++++++++----
 src/rufus.rc | 10 +++++-----
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/rufus.c b/src/rufus.c
index 9d59ec67..623e2dc0 100755
--- a/src/rufus.c
+++ b/src/rufus.c
@@ -697,15 +697,19 @@ static void EnableQuickFormat(BOOL enable)
 {
 	HWND hCtrl = GetDlgItem(hMainDialog, IDC_QUICK_FORMAT);
 
+	// Keep track of the current state if we are going to disable it
+	if (IsWindowEnabled(hCtrl) && !enable) {
+		uQFChecked = IsChecked(IDC_QUICK_FORMAT);
+	}
+
 	// Disable/restore the quick format control depending on large FAT32 or ReFS
 	if (((fs == FS_FAT32) && ((SelectedDrive.DiskSize > LARGE_FAT32_SIZE) || (force_large_fat32))) || (fs == FS_REFS)) {
 		enable = FALSE;
+		CheckDlgButton(hMainDialog, IDC_QUICK_FORMAT, BST_CHECKED);
 	}
 
-	if (IsWindowEnabled(hCtrl) && !enable) {
-		uQFChecked = IsChecked(IDC_QUICK_FORMAT);
-		CheckDlgButton(hMainDialog, IDC_QUICK_FORMAT, BST_CHECKED);
-	} else if (!IsWindowEnabled(hCtrl) && enable) {
+	// Restore state if we are re-enabling the control
+	if (!IsWindowEnabled(hCtrl) && enable) {
 		CheckDlgButton(hMainDialog, IDC_QUICK_FORMAT, uQFChecked);
 	}
 
diff --git a/src/rufus.rc b/src/rufus.rc
index 2ac9e257..c1a3b840 100644
--- a/src/rufus.rc
+++ b/src/rufus.rc
@@ -33,7 +33,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 IDD_DIALOG DIALOGEX 12, 12, 232, 326
 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_ACCEPTFILES
-CAPTION "Rufus 3.5.1445"
+CAPTION "Rufus 3.5.1446"
 FONT 9, "Segoe UI Symbol", 400, 0, 0x0
 BEGIN
     LTEXT           "Drive Properties",IDS_DRIVE_PROPERTIES_TXT,8,6,53,12,NOT WS_GROUP
@@ -394,8 +394,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,5,1445,0
- PRODUCTVERSION 3,5,1445,0
+ FILEVERSION 3,5,1446,0
+ PRODUCTVERSION 3,5,1446,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -413,13 +413,13 @@ BEGIN
             VALUE "Comments", "https://akeo.ie"
             VALUE "CompanyName", "Akeo Consulting"
             VALUE "FileDescription", "Rufus"
-            VALUE "FileVersion", "3.5.1445"
+            VALUE "FileVersion", "3.5.1446"
             VALUE "InternalName", "Rufus"
             VALUE "LegalCopyright", "© 2011-2018 Pete Batard (GPL v3)"
             VALUE "LegalTrademarks", "https://www.gnu.org/copyleft/gpl.html"
             VALUE "OriginalFilename", "rufus-3.5.exe"
             VALUE "ProductName", "Rufus"
-            VALUE "ProductVersion", "3.5.1445"
+            VALUE "ProductVersion", "3.5.1446"
         END
     END
     BLOCK "VarFileInfo"