From c0bcfd8bf2f14a9bdc467a39034265579e06ec3f Mon Sep 17 00:00:00 2001
From: Mike Kelly <167896478+MKellyCBSD@users.noreply.github.com>
Date: Wed, 10 Jul 2024 15:52:09 -0400
Subject: [PATCH] Update USBImagingToolCreator.ps1

Changed the way the DisableAutoplay switch runs. Now it only changes the registry setting if it the current value is set to "0". then it restores the setting back to the previous value
---
 FFUDevelopment/USBImagingToolCreator.ps1 | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/FFUDevelopment/USBImagingToolCreator.ps1 b/FFUDevelopment/USBImagingToolCreator.ps1
index 622e30c..dd3f36d 100644
--- a/FFUDevelopment/USBImagingToolCreator.ps1
+++ b/FFUDevelopment/USBImagingToolCreator.ps1
@@ -177,7 +177,10 @@ Function New-DeploymentUSB {
             $var = $false
         }
     } until (($DriveSelected -le $Count -1 -or $last) -and $var)
-    if($DisableAutoPlay){ 
+
+    $DisableAutoPlayCurrentSetting = (Get-ItemProperty -Path "HKCU:\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\AutoplayHandlers" -Name DisableAutoplay).DisableAutoplay
+    if($DisableAutoPlay -and $DisableAutoPlayCurrentSetting -ne 1){
+    writelog "Disable autoPlay current setting is $DisableAutoPlayCurrentSetting"
     WriteLog "Setting the registry key to disable autoplay for all drives"
     Set-ItemProperty -Path "HKCU:\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\AutoplayHandlers" -Name "DisableAutoplay" -Value 1 -Type DWORD
     }
@@ -196,8 +199,8 @@ Function New-DeploymentUSB {
     }
     WriteLog "Setting the registry key to re-enable autoplay for all drives"
     if($DisableAutoPlay){
-    Writelog "Enabling Autoplay"
-    Set-ItemProperty -Path "HKCU:\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\AutoplayHandlers" -Name "DisableAutoplay" -Value 0 -Type DWORD
+    Writelog "Setting disable autoplay setting back to $DisableAutoPlayCurrentSetting"
+    Set-ItemProperty -Path "HKCU:\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\AutoplayHandlers" -Name "DisableAutoplay" -Value $DisableAutoPlayCurrentSetting -Type DWORD
     }
     Writelog "Completed!"
 }