add explicit check for key open if set key fails

Author: tomysshadow

FlashpointSecurePlayer/RegistryStates.cs

@@ -256,7 +256,19 @@ private void SetKeyInRegistryView(string keyName, RegistryView registryView) {
                     }
                 }
             } catch (UnauthorizedAccessException) {
-                // key exists and we can't set it
+                // if the key already exists and can be opened, don't worry about it
+                // (this is mainly to deal with permissions issues)
+                try {
+                    using (RegistryKey registryKey = OpenKeyInRegistryView(keyName, false, registryView)) {
+                        if (registryKey != null) {
+                            return;
+                        }
+                    }
+                } catch {
+                    // fail silently
+                }
+
+                throw;
             }
         }
 
@@ -341,10 +353,11 @@ private void SetValueInRegistryView(string keyName, string valueName, object val
                     registryKey.SetValue(valueName, value, valueKind);
                 }
             } catch (UnauthorizedAccessException) {
+                // if the value already exists and is an exact string match, don't worry about it
+                // (this is mainly to deal with permissions issues)
                 try {
                     object _value = GetValueInRegistryView(keyName, valueName, out RegistryValueKind? _valueKind, registryView);
 
-                    // if it's an exact string match, don't worry about it
                     if (valueKind == _valueKind) {
                         if (value is string valueString
                             && _value is string _valueString) {
@@ -356,6 +369,7 @@ private void SetValueInRegistryView(string keyName, string valueName, object val
                 } catch {
                     // fail silently
                 }
+
                 throw;
             }
         }
@@ -1018,6 +1032,10 @@ public override void Activate(string templateName) {
                                     // key doesn't exist and we can't set it
                                     LogExceptionToLauncher(ex);
                                     throw new TaskRequiresElevationException("Setting the key \"" + keyName + "\" requires elevation.");
+                                } catch (UnauthorizedAccessException ex) {
+                                    // key exists and we can't set it
+                                    LogExceptionToLauncher(ex);
+                                    throw new TaskRequiresElevationException("Setting the key \"" + keyName + "\" requires elevation.");
                                 } catch (InvalidOperationException ex) {
                                     // key marked for deletion
                                     LogExceptionToLauncher(ex);