1 files changed, 14 insertions, 4 deletions
diff --git a/src/Common/Dlgcode.c b/src/Common/Dlgcode.c
index c9d01290..bfa8a32e 100644
--- a/src/Common/Dlgcode.c
+++ b/src/Common/Dlgcode.c
@@ -6888,14 +6888,14 @@ retry:
 
 	return 1;
 }
 
-
-BOOL UnmountVolume (HWND hwndDlg, int nDosDriveNo, BOOL forceUnmount)
+static BOOL UnmountVolumeBase (HWND hwndDlg, int nDosDriveNo, BOOL forceUnmount, BOOL ntfsFormatCase)
 {
 	int result;
 	BOOL forced = forceUnmount;
-	int dismountMaxRetries = UNMOUNT_MAX_AUTO_RETRIES;
+	int dismountMaxRetries = ntfsFormatCase? 5 : UNMOUNT_MAX_AUTO_RETRIES;
+	DWORD retryDelay = ntfsFormatCase? 2000: UNMOUNT_AUTO_RETRY_DELAY;
 
 retry:
 	BroadcastDeviceChange (DBT_DEVICEREMOVEPENDING, nDosDriveNo, 0);
 
@@ -6903,9 +6903,9 @@ retry:
 	{
 		result = DriverUnmountVolume (hwndDlg, nDosDriveNo, forced);
 
 		if (result == ERR_FILES_OPEN)
-			Sleep (UNMOUNT_AUTO_RETRY_DELAY);
+			Sleep (retryDelay);
 		else
 			break;
 
 	} while (--dismountMaxRetries > 0);
@@ -6939,8 +6939,18 @@ retry:
 
 	return TRUE;
 }
 
+BOOL UnmountVolume (HWND hwndDlg, int nDosDriveNo, BOOL forceUnmount)
+{
+	return UnmountVolumeBase (hwndDlg, nDosDriveNo, forceUnmount, FALSE);
+}
+
+BOOL UnmountVolumeAfterFormatExCall (HWND hwndDlg, int nDosDriveNo)
+{
+	return UnmountVolumeBase (hwndDlg, nDosDriveNo, FALSE, TRUE);
+}
+
 
 BOOL IsPasswordCacheEmpty (void)
 {
 	DWORD dw;