1 files changed, 15 insertions, 9 deletions
diff --git a/src/Common/Format.c b/src/Common/Format.c
index fe1f271f..3fede6d5 100644
--- a/src/Common/Format.c
+++ b/src/Common/Format.c
@@ -285,5 +285,5 @@ begin_format:
 				if (dev != INVALID_HANDLE_VALUE)
 				{
-					if (IDNO == MessageBoxW (volParams->hwndDlg, GetString ("DEVICE_IN_USE_FORMAT"), lpszTitle, MB_YESNO|MB_ICONWARNING|MB_DEFBUTTON2))
+					if (!volParams->bForceOperation && (Silent || (IDNO == MessageBoxW (volParams->hwndDlg, GetString ("DEVICE_IN_USE_FORMAT"), lpszTitle, MB_YESNO|MB_ICONWARNING|MB_DEFBUTTON2))))
 					{
 						nStatus = ERR_DONT_REPORT; 
@@ -382,5 +382,5 @@ begin_format:
 	}
 
-	KillTimer (volParams->hwndDlg, TIMER_ID_RANDVIEW);
+	if (volParams->hwndDlg && volParams->bGuiMode) KillTimer (volParams->hwndDlg, TIMER_ID_RANDVIEW);
 
 	/* Volume header */
@@ -619,6 +619,9 @@ error:
 		if (driveNo == -1)
 		{
-			MessageBoxW (volParams->hwndDlg, GetString ("NO_FREE_DRIVES"), lpszTitle, ICON_HAND);
-			MessageBoxW (volParams->hwndDlg, GetString ("FORMAT_NTFS_STOP"), lpszTitle, ICON_HAND);
+			if (!Silent)
+			{
+				MessageBoxW (volParams->hwndDlg, GetString ("NO_FREE_DRIVES"), lpszTitle, ICON_HAND);
+				MessageBoxW (volParams->hwndDlg, GetString ("FORMAT_NTFS_STOP"), lpszTitle, ICON_HAND);
+			}
 
 			nStatus = ERR_NO_FREE_DRIVES;
@@ -635,11 +638,14 @@ error:
 		if (MountVolume (volParams->hwndDlg, driveNo, volParams->volumePath, volParams->password, volParams->pkcs5, volParams->pim, FALSE, FALSE, TRUE, &mountOptions, FALSE, TRUE) < 1)
 		{
-			MessageBoxW (volParams->hwndDlg, GetString ("CANT_MOUNT_VOLUME"), lpszTitle, ICON_HAND);
-			MessageBoxW (volParams->hwndDlg, GetString ("FORMAT_NTFS_STOP"), lpszTitle, ICON_HAND);
+			if (!Silent)
+			{
+				MessageBoxW (volParams->hwndDlg, GetString ("CANT_MOUNT_VOLUME"), lpszTitle, ICON_HAND);
+				MessageBoxW (volParams->hwndDlg, GetString ("FORMAT_NTFS_STOP"), lpszTitle, ICON_HAND);
+			}
 			nStatus = ERR_VOL_MOUNT_FAILED;
 			goto fv_end;
 		}
 
-		if (!IsAdmin () && IsUacSupported ())
+		if (!Silent && !IsAdmin () && IsUacSupported ())
 			retCode = UacFormatNtfs (volParams->hwndDlg, driveNo, volParams->clusterSize);
 		else
@@ -648,5 +654,5 @@ error:
 		if (retCode != TRUE)
 		{
-			if (!UnmountVolumeAfterFormatExCall (volParams->hwndDlg, driveNo))
+			if (!UnmountVolumeAfterFormatExCall (volParams->hwndDlg, driveNo) && !Silent)
 				MessageBoxW (volParams->hwndDlg, GetString ("CANT_DISMOUNT_VOLUME"), lpszTitle, ICON_HAND);
 
@@ -670,5 +676,5 @@ error:
 		}
 
-		if (!UnmountVolumeAfterFormatExCall (volParams->hwndDlg, driveNo))
+		if (!UnmountVolumeAfterFormatExCall (volParams->hwndDlg, driveNo) && !Silent)
 			MessageBoxW (volParams->hwndDlg, GetString ("CANT_DISMOUNT_VOLUME"), lpszTitle, ICON_HAND);
 	}