Check if Windows registry value exists before trying to delete

This commit is contained in:
JonnyWong16 2020-04-27 19:49:14 -07:00
parent fb51894fad
commit a8783ac351
No known key found for this signature in database
GPG key ID: B1F1F9807184697A

View file

@ -150,12 +150,20 @@ def set_startup():
return False return False
else: else:
# Check if registry value exists
try: try:
registry_key = winreg.OpenKey(winreg.HKEY_CURRENT_USER, startup_reg_path, 0, winreg.KEY_ALL_ACCESS) registry_key = winreg.OpenKey(winreg.HKEY_CURRENT_USER, startup_reg_path, 0, winreg.KEY_ALL_ACCESS)
winreg.DeleteValue(registry_key, common.PRODUCT) winreg.QueryValueEx(registry_key, common.PRODUCT)
winreg.CloseKey(registry_key) reg_value_exists = True
logger.info("Removed Tautulli from Windows system startup registry key.") except WindowsError:
return True reg_value_exists = False
except WindowsError as e:
logger.error("Failed to delete Windows system startup registry key: %s", e) if reg_value_exists:
return False try:
winreg.DeleteValue(registry_key, common.PRODUCT)
winreg.CloseKey(registry_key)
logger.info("Removed Tautulli from Windows system startup registry key.")
return True
except WindowsError as e:
logger.error("Failed to delete Windows system startup registry key: %s", e)
return False