From c2ba8fc0d2e72d9c9c4417da0c46e1a1e6778cec Mon Sep 17 00:00:00 2001
From: Pete Batard <pete@akeo.ie>
Date: Tue, 30 Oct 2018 16:14:07 +0000
Subject: [PATCH] [ui] fix UI elements that don't match commandline parameters

---
 src/rufus.c  | 21 +++++++++------------
 src/rufus.rc | 10 +++++-----
 2 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/src/rufus.c b/src/rufus.c
index 02109a29..43ee0ae6 100644
--- a/src/rufus.c
+++ b/src/rufus.c
@@ -67,7 +67,7 @@ static BOOL app_changed_label = FALSE;
 static BOOL allowed_filesystem[FS_MAX] = { 0 };
 static int64_t last_iso_blocking_status;
 static int selected_pt = -1, selected_fs = FS_UNKNOWN, preselected_fs = FS_UNKNOWN;
-static int image_index;
+static int image_index = 0;
 static RECT relaunch_rc = { -65536, -65536, 0, 0};
 static UINT uQFChecked = BST_CHECKED, uMBRChecked = BST_UNCHECKED;
 static HANDLE format_thid = NULL, dialog_handle = NULL;
@@ -1008,19 +1008,14 @@ static void DisplayISOProps(void)
 // Insert the image name into the Boot selection dropdown
 static void UpdateImage(void)
 {
-	int index;
+	assert(image_index != 0);
 
-	for (index = 0; index < ComboBox_GetCount(hBootType); index++) {
-		if (ComboBox_GetItemData(hBootType, index) == BT_IMAGE) {
-			break;
-		}
-	}
-
-	ComboBox_DeleteString(hBootType, index);
-	ComboBox_InsertStringU(hBootType, index, 
+	if (ComboBox_GetItemData(hBootType, image_index) == BT_IMAGE)
+		ComboBox_DeleteString(hBootType, image_index);
+	ComboBox_InsertStringU(hBootType, image_index,
 		(image_path == NULL) ? lmprintf(MSG_281, lmprintf(MSG_280)) : short_image_path);
-	ComboBox_SetItemData(hBootType, index, BT_IMAGE);
-	IGNORE_RETVAL(ComboBox_SetCurSel(hBootType, index));
+	ComboBox_SetItemData(hBootType, image_index, BT_IMAGE);
+	IGNORE_RETVAL(ComboBox_SetCurSel(hBootType, image_index));
 	bt = (int)ComboBox_GetItemData(hBootType, ComboBox_GetCurSel(hBootType));
 	SetBootTypeDropdownWidth();
 }
@@ -1657,6 +1652,8 @@ static void InitDialog(HWND hDlg)
 	}
 	SetBootTypeDropdownWidth();
 
+	CheckDlgButton(hMainDialog, IDC_LIST_USB_HDD, enable_HDDs ? BST_CHECKED : BST_UNCHECKED);
+
 	PrintInfo(0, MSG_210);
 }
 
diff --git a/src/rufus.rc b/src/rufus.rc
index 7acfc4f1..046baeef 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.4.1420"
+CAPTION "Rufus 3.4.1421"
 FONT 9, "Segoe UI Symbol", 400, 0, 0x0
 BEGIN
     LTEXT           "Drive Properties",IDS_DRIVE_PROPERTIES_TXT,8,6,53,12,NOT WS_GROUP
@@ -392,8 +392,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,4,1420,0
- PRODUCTVERSION 3,4,1420,0
+ FILEVERSION 3,4,1421,0
+ PRODUCTVERSION 3,4,1421,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -411,13 +411,13 @@ BEGIN
             VALUE "Comments", "https://akeo.ie"
             VALUE "CompanyName", "Akeo Consulting"
             VALUE "FileDescription", "Rufus"
-            VALUE "FileVersion", "3.4.1420"
+            VALUE "FileVersion", "3.4.1421"
             VALUE "InternalName", "Rufus"
             VALUE "LegalCopyright", "© 2011-2018 Pete Batard (GPL v3)"
             VALUE "LegalTrademarks", "https://www.gnu.org/copyleft/gpl.html"
             VALUE "OriginalFilename", "rufus-3.4.exe"
             VALUE "ProductName", "Rufus"
-            VALUE "ProductVersion", "3.4.1420"
+            VALUE "ProductVersion", "3.4.1421"
         END
     END
     BLOCK "VarFileInfo"