a little cleanup

Author: tomysshadow

FlashpointSecurePlayer/FlashpointSecurePlayer.csproj

@@ -98,7 +98,6 @@
     <Compile Include="OldCPUSimulator.cs" />
     <Compile Include="ProgressManager.cs" />
     <Compile Include="RunAsAdministrator.cs" />
-    <Compile Include="Settings.cs" />
     <Compile Include="Shared.cs" />
     <Compile Include="SingleInstance.cs" />
     <Compile Include="ProcessSync.cs" />

FlashpointSecurePlayer/RegistryBackups.cs

@@ -981,11 +981,7 @@ public async Task StopImportAsync() {
                         break;
                         case TYPE.VALUE:
                         try {
-                            if (String.IsNullOrEmpty(activeRegistryBackupElement._ValueExpanded)) {
-                                SetValueInRegistryView(keyName, registryBackupElement.ValueName, registryBackupElement.Value, registryBackupElement.ValueKind.GetValueOrDefault(), registryView);
-                            } else {
-                                SetValueInRegistryView(keyName, registryBackupElement.ValueName, activeRegistryBackupElement._ValueExpanded, registryBackupElement.ValueKind.GetValueOrDefault(), registryView);
-                            }
+                            SetValueInRegistryView(keyName, registryBackupElement.ValueName, String.IsNullOrEmpty(activeRegistryBackupElement._ValueExpanded) ? registryBackupElement.Value : activeRegistryBackupElement._ValueExpanded, registryBackupElement.ValueKind.GetValueOrDefault(), registryView);
                         } catch (FormatException) {
                             // value marked for deletion
                             Deactivate();
@@ -1102,14 +1098,8 @@ public async Task StopImportAsync() {
                                 if (value == null) {
                                     clear = true;
                                 } else {
-                                    if (String.IsNullOrEmpty(activeRegistryBackupElement._ValueExpanded)) {
-                                        if (value.ToString() != registryBackupElement.Value) {
-                                            clear = true;
-                                        }
-                                    } else {
-                                        if (value.ToString() != activeRegistryBackupElement._ValueExpanded) {
-                                            clear = true;
-                                        }
+                                    if (value.ToString() != (String.IsNullOrEmpty(activeRegistryBackupElement._ValueExpanded) ? registryBackupElement.Value : activeRegistryBackupElement._ValueExpanded)) {
+                                        clear = true;
                                     }
                                 }