Skip to content

Commit 3ab1ef3

Browse files
committed
update to ensure admin user is consistent for registry backups
1 parent d4d0fa5 commit 3ab1ef3

File tree

4 files changed

+20
-3
lines changed

4 files changed

+20
-3
lines changed

FlashpointSecurePlayer/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
// You can specify all the values or you can default the Build and Revision Numbers
3434
// by using the '*' as shown below:
3535
// [assembly: AssemblyVersion("1.0.*")]
36-
[assembly: AssemblyVersion("1.1.0.0")]
37-
[assembly: AssemblyFileVersion("1.1.0.0")]
36+
[assembly: AssemblyVersion("1.1.1.0")]
37+
[assembly: AssemblyFileVersion("1.1.1.0")]
3838
[assembly: NeutralResourcesLanguage("en")]
3939

FlashpointSecurePlayer/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Flashpoint Secure Player 1.1.0
1+
# Flashpoint Secure Player 1.1.1
22
This player attempts to solve common compatibility or portability issues posed by browser plugins on Windows for the purpose of playback in BlueMaxima's Flashpoint.
33

44
It is compatible with Windows 7, Windows 8, Windows 8.1 and Windows 10, and requires .NET Framework 4.5. If you are on Windows 8.1 or Windows 10, or if you are on Windows 7/8 and have updates enabled, you already have .NET Framework 4.5. Otherwise, you may [download .NET Framework 4.5.](http://www.microsoft.com/en-us/download/details.aspx?id=30653)

FlashpointSecurePlayer/RegistryBackups.cs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -848,6 +848,7 @@ public async Task StopImportAsync() {
848848
throw new ArgumentException("The path to " + Name + " is not supported.");
849849
}
850850

851+
activeModificationsElement.RegistryBackups._Administrator = TestLaunchedAsAdministratorUser();
851852
RegistryView registryView = RegistryView.Registry32;
852853

853854
if (modificationsElement.RegistryBackups.BinaryType == BINARY_TYPE.SCS_64BIT_BINARY) {
@@ -1017,6 +1018,11 @@ public async Task StopImportAsync() {
10171018
object value = null;
10181019
bool clear = false;
10191020

1021+
if (activeModificationsElement.RegistryBackups._Administrator != TestLaunchedAsAdministratorUser()) {
1022+
// TODO: lame
1023+
throw new TaskRequiresElevationException("Deactivating the Registry Backup requires elevation.");
1024+
}
1025+
10201026
RegistryView registryView = RegistryView.Registry32;
10211027

10221028
if (modificationsElement.RegistryBackups.BinaryType == BINARY_TYPE.SCS_64BIT_BINARY) {

FlashpointSecurePlayer/Shared.cs

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -687,6 +687,17 @@ public BINARY_TYPE BinaryType {
687687
base["binaryType"] = value;
688688
}
689689
}
690+
691+
[ConfigurationProperty("_administrator", DefaultValue = false, IsRequired = false)]
692+
public bool _Administrator {
693+
get {
694+
return (bool)base["_administrator"];
695+
}
696+
697+
set {
698+
base["_administrator"] = value;
699+
}
700+
}
690701
}
691702

692703
[ConfigurationProperty("registryBackups", IsRequired = false)]

0 commit comments

Comments
 (0)