From f6687e729b601fa55dc088c9cb0127fa7a6cdf05 Mon Sep 17 00:00:00 2001
From: Pete Batard <pete@akeo.ie>
Date: Wed, 5 Jun 2019 17:00:21 +0100
Subject: [PATCH] [ui] fix unwanted persistence unit overlay

* Also fix a typo and make sure to quote more paths when invoking Fido.
---
 src/format.c |  2 --
 src/net.c    |  4 ++--
 src/rufus.c  |  2 +-
 src/rufus.rc | 10 +++++-----
 src/ui.c     |  6 +++---
 src/ui.h     |  2 +-
 6 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/src/format.c b/src/format.c
index e067d2b1..f34c1776 100644
--- a/src/format.c
+++ b/src/format.c
@@ -2628,8 +2628,6 @@ DWORD WINAPI FormatThread(void* param)
 	hLogicalVolume = INVALID_HANDLE_VALUE;
 
 	// VDS wants us to unlock the phys
-	// TODO: IVdsDiskOnline::Offline? -> NOPE, NO_GO for removable media
-	// TODO: IVdsService::Refresh()? IVdsHwProvider::Reenumerate()??
 	if (use_vds) {
 		safe_unlockclose(hPhysicalDrive);
 		uprintf("Refreshing drive layout...");
diff --git a/src/net.c b/src/net.c
index f312c492..de7d5863 100644
--- a/src/net.c
+++ b/src/net.c
@@ -982,8 +982,8 @@ static DWORD WINAPI DownloadISOThread(LPVOID param)
 		goto out;
 	}
 
-	static_sprintf(cmdline, "%s -NonInteractive -Sta -NoProfile –ExecutionPolicy Bypass "
-		"-File \"%s\" -DisableFirstRunCustomize -PipeName %s -LocData \"%s\" -Icon %s -AppTitle \"%s\"",
+	static_sprintf(cmdline, "\"%s\" -NonInteractive -Sta -NoProfile –ExecutionPolicy Bypass "
+		"-File \"%s\" -DisableFirstRunCustomize -PipeName %s -LocData \"%s\" -Icon \"%s\" -AppTitle \"%s\"",
 		powershell_path, script_path, &pipe[9], locale_str, icon_path, lmprintf(MSG_149));
 	// Signal our Windows alert hook that it should close the IE cookie prompts from Fido
 	close_fido_cookie_prompts = TRUE;
diff --git a/src/rufus.c b/src/rufus.c
index 080b6a02..d072c3bc 100755
--- a/src/rufus.c
+++ b/src/rufus.c
@@ -2523,7 +2523,7 @@ static INT_PTR CALLBACK MainCallback(HWND hDlg, UINT message, WPARAM wParam, LPA
 
 	case WM_HSCROLL:
 		lPos = (LONG)SendMessage(GetDlgItem(hMainDialog, IDC_PERSISTENCE_SLIDER), TBM_GETPOS, 0, 0);
-		SetPeristencePos(lPos);
+		SetPersistencePos(lPos);
 		persistence_size = lPos * MB;
 		for (i = 0; i < persistence_unit_selection; i++)
 			persistence_size *= 1024;
diff --git a/src/rufus.rc b/src/rufus.rc
index 23875075..c0a3aad4 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.6.1537"
+CAPTION "Rufus 3.6.1538"
 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,6,1537,0
- PRODUCTVERSION 3,6,1537,0
+ FILEVERSION 3,6,1538,0
+ PRODUCTVERSION 3,6,1538,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.6.1537"
+            VALUE "FileVersion", "3.6.1538"
             VALUE "InternalName", "Rufus"
             VALUE "LegalCopyright", "© 2011-2019 Pete Batard (GPL v3)"
             VALUE "LegalTrademarks", "https://www.gnu.org/copyleft/gpl.html"
             VALUE "OriginalFilename", "rufus-3.6.exe"
             VALUE "ProductName", "Rufus"
-            VALUE "ProductVersion", "3.6.1537"
+            VALUE "ProductVersion", "3.6.1538"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/src/ui.c b/src/ui.c
index 904cf8b3..c22b26f9 100644
--- a/src/ui.c
+++ b/src/ui.c
@@ -686,11 +686,11 @@ void TogglePersistenceControls(BOOL display)
 	ShowWindow(hUnits, display ? SW_SHOW : SW_HIDE);
 }
 
-void SetPeristencePos(uint64_t pos)
+void SetPersistencePos(uint64_t pos)
 {
 	char tmp[64];
 
-	if (pos != 0) {
+	if ((boot_type == BT_IMAGE) && (pos != 0)) {
 		TogglePersistenceControls(TRUE);
 		static_sprintf(tmp, "%ld", (LONG)pos);
 	} else {
@@ -745,7 +745,7 @@ void SetPersistenceSize(void)
 	SendMessage(hCtrl, TBM_SETRANGEMAX, (WPARAM)TRUE, (LPARAM)max);
 	SendMessage(hCtrl, TBM_SETPOS, (WPARAM)TRUE, (LPARAM)pos);
 
-	SetPeristencePos(pos);
+	SetPersistencePos(pos);
 }
 
 // Toggle the Image Option dropdown (Windows To Go or persistence settings)
diff --git a/src/ui.h b/src/ui.h
index 614bd43d..d76839de 100644
--- a/src/ui.h
+++ b/src/ui.h
@@ -63,7 +63,7 @@ extern void GetFullWidth(HWND hDlg);
 extern void PositionMainControls(HWND hDlg);
 extern void AdjustForLowDPI(HWND hDlg);
 extern void SetSectionHeaders(HWND hDlg);
-extern void SetPeristencePos(uint64_t pos);
+extern void SetPersistencePos(uint64_t pos);
 extern void SetPersistenceSize(void);
 extern void TogglePersistenceControls(BOOL display);
 extern void ToggleAdvancedDeviceOptions(BOOL enable);