Skip to content

Commit 0b2bafd

Browse files
committed
don't revert player specific variables
1 parent 8124787 commit 0b2bafd

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

FlashpointSecurePlayer/EnvironmentVariables.cs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ private string GetComparableName(string name) {
3131
return comparableNameLength == -1 ? name : name.Substring(0, comparableNameLength);
3232
}
3333

34-
private string GetFlashpointProxyName(bool active, string name, out string comparableName) {
34+
private string GetFlashpointProxyName(string name, out string comparableName) {
3535
comparableName = null;
3636

3737
if (name == null) {
@@ -57,15 +57,15 @@ private string GetFlashpointProxyName(bool active, string name, out string compa
5757
FlashpointProxy.GetPreferences(out bool proxy, out int port);
5858

5959
if (Environment.GetEnvironmentVariable(FlashpointProxy.FLASHPOINT_SECURE_PLAYER_PROXY, EnvironmentVariableTarget.Process) == null) {
60-
Environment.SetEnvironmentVariable(FlashpointProxy.FLASHPOINT_SECURE_PLAYER_PROXY, active ? (proxy ? "1" : "0") : null, EnvironmentVariableTarget.Process);
60+
Environment.SetEnvironmentVariable(FlashpointProxy.FLASHPOINT_SECURE_PLAYER_PROXY, proxy ? "1" : "0", EnvironmentVariableTarget.Process);
6161
}
6262
} else if (comparableName.Equals(FlashpointProxy.FP_PROXY_PORT, StringComparison.OrdinalIgnoreCase)) {
6363
name = FlashpointProxy.FP_PROXY_PORT;
6464

6565
FlashpointProxy.GetPreferences(out bool proxy, out int port);
6666

6767
if (Environment.GetEnvironmentVariable(FlashpointProxy.FLASHPOINT_SECURE_PLAYER_PROXY_PORT, EnvironmentVariableTarget.Process) == null) {
68-
Environment.SetEnvironmentVariable(FlashpointProxy.FLASHPOINT_SECURE_PLAYER_PROXY_PORT, active ? port.ToString() : null, EnvironmentVariableTarget.Process);
68+
Environment.SetEnvironmentVariable(FlashpointProxy.FLASHPOINT_SECURE_PLAYER_PROXY_PORT, port.ToString(), EnvironmentVariableTarget.Process);
6969
}
7070
}
7171
} catch (SecurityException ex) {
@@ -78,14 +78,14 @@ private string GetFlashpointProxyName(bool active, string name, out string compa
7878
return name;
7979
}
8080

81-
private string GetValue(bool active, EnvironmentVariablesElement environmentVariablesElement) {
81+
private string GetValue(EnvironmentVariablesElement environmentVariablesElement) {
8282
if (String.IsNullOrEmpty(environmentVariablesElement.Find)) {
8383
return environmentVariablesElement.Value;
8484
}
8585

8686
string value = null;
8787

88-
string name = GetFlashpointProxyName(active, environmentVariablesElement.Name, out string comparableName);
88+
string name = GetFlashpointProxyName(environmentVariablesElement.Name, out string comparableName);
8989

9090
if (name == null) {
9191
return value;
@@ -193,7 +193,7 @@ public override void Activate(string templateName) {
193193
throw new ConfigurationErrorsException("The Environment Variables Element (" + i + ") is null while creating the Active Environment Variables Element.");
194194
}
195195

196-
name = GetFlashpointProxyName(true, environmentVariablesElement.Name, out comparableName);
196+
name = GetFlashpointProxyName(environmentVariablesElement.Name, out comparableName);
197197

198198
if (name == null) {
199199
throw new InvalidEnvironmentVariablesException("The name is null while creating the Active Environment Variables Element.");
@@ -233,7 +233,7 @@ public override void Activate(string templateName) {
233233
throw new ConfigurationErrorsException("The Environment Variables Element (" + i + ") is null.");
234234
}
235235

236-
name = GetFlashpointProxyName(true, environmentVariablesElement.Name, out comparableName);
236+
name = GetFlashpointProxyName(environmentVariablesElement.Name, out comparableName);
237237

238238
if (name == null) {
239239
throw new InvalidEnvironmentVariablesException("The name is null.");
@@ -245,7 +245,7 @@ public override void Activate(string templateName) {
245245
}
246246
}
247247

248-
value = GetValue(true, environmentVariablesElement);
248+
value = GetValue(environmentVariablesElement);
249249

250250
try {
251251
Environment.SetEnvironmentVariable(name, Environment.ExpandEnvironmentVariables(value), EnvironmentVariableTarget.Process);
@@ -367,7 +367,7 @@ public void Deactivate(MODIFICATIONS_REVERT_METHOD modificationsRevertMethod) {
367367
throw new InvalidEnvironmentVariablesException("The Environment Variable element (" + i + ") is null.");
368368
}
369369

370-
name = GetFlashpointProxyName(false, environmentVariablesElement.Name, out comparableName);
370+
name = GetFlashpointProxyName(environmentVariablesElement.Name, out comparableName);
371371

372372
if (name == null) {
373373
throw new InvalidEnvironmentVariablesException("The name is null.");

0 commit comments

Comments
 (0)