From 6a45a678b303f30c196f083904767afcab56acbe Mon Sep 17 00:00:00 2001
From: Pete Batard <pete@akeo.ie>
Date: Mon, 23 Oct 2017 17:09:18 +0100
Subject: [PATCH] [ui] ensure that the same drive is re-selected on device
 refresh

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

diff --git a/src/rufus.c b/src/rufus.c
index ed58ee8c..06242196 100644
--- a/src/rufus.c
+++ b/src/rufus.c
@@ -2293,12 +2293,7 @@ static INT_PTR CALLBACK MainCallback(HWND hDlg, UINT message, WPARAM wParam, LPA
 	case WM_COMMAND:
 #ifdef RUFUS_TEST
 		if (LOWORD(wParam) == IDC_TEST) {
-			uprintf("ts = %lld", GetSignatureTimeStamp("C:\\rufus\\rufus-2.17_BETA.exe"));
-//			ExtractEfiImgFiles("C:\\rufus");
-//			ExtractEFI("C:\\rufus\\efi.img", "C:\\rufus\\efi");
-//			uprintf("Proceed = %s", CheckDriveAccess(2000)?"True":"False");
-//			char* choices[] = { "Choice 1", "Choice 2", "Choice 3" };
-//			SelectionDyn("Test Choice", "Unused", choices, ARRAYSIZE(choices));
+			GetDevices(DeviceNum);
 			break;
 		}
 #endif
@@ -2425,6 +2420,8 @@ static INT_PTR CALLBACK MainCallback(HWND hDlg, UINT message, WPARAM wParam, LPA
 			PopulateProperties(ComboBox_GetCurSel(hDeviceList));
 			SendMessage(hMainDialog, WM_COMMAND, (CBN_SELCHANGE<<16) | IDC_FILESYSTEM,
 				ComboBox_GetCurSel(hFileSystem));
+			nDeviceIndex = ComboBox_GetCurSel(hDeviceList);
+			DeviceNum = (nDeviceIndex == CB_ERR) ? 0 : (DWORD)ComboBox_GetItemData(hDeviceList, nDeviceIndex);
 			break;
 		case IDC_NBPASSES:
 			if (HIWORD(wParam) != CBN_SELCHANGE)
diff --git a/src/rufus.h b/src/rufus.h
index ab1f7223..27e48262 100644
--- a/src/rufus.h
+++ b/src/rufus.h
@@ -31,7 +31,7 @@
 /* Program options */
 #define RUFUS_LOGGING               // print info to logging facility
 /* Features not ready for prime time and that may *DESTROY* your data - USE AT YOUR OWN RISKS! */
-// #define RUFUS_TEST
+//#define RUFUS_TEST
 
 #define APPLICATION_NAME            "Rufus"
 #define COMPANY_NAME                "Akeo Consulting"
diff --git a/src/rufus.rc b/src/rufus.rc
index 352546a7..bd4f1ba2 100644
--- a/src/rufus.rc
+++ b/src/rufus.rc
@@ -33,7 +33,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
 EXSTYLE WS_EX_ACCEPTFILES
-CAPTION "Rufus 2.18.1206"
+CAPTION "Rufus 2.18.1207"
 FONT 8, "Segoe UI Symbol", 400, 0, 0x0
 BEGIN
     LTEXT           "Device",IDS_DEVICE_TXT,9,6,200,8
@@ -366,8 +366,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,18,1206,0
- PRODUCTVERSION 2,18,1206,0
+ FILEVERSION 2,18,1207,0
+ PRODUCTVERSION 2,18,1207,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -384,13 +384,13 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Akeo Consulting (http://akeo.ie)"
             VALUE "FileDescription", "Rufus"
-            VALUE "FileVersion", "2.18.1206"
+            VALUE "FileVersion", "2.18.1207"
             VALUE "InternalName", "Rufus"
             VALUE "LegalCopyright", "© 2011-2017 Pete Batard (GPL v3)"
             VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html"
             VALUE "OriginalFilename", "rufus.exe"
             VALUE "ProductName", "Rufus"
-            VALUE "ProductVersion", "2.18.1206"
+            VALUE "ProductVersion", "2.18.1207"
         END
     END
     BLOCK "VarFileInfo"