@@ -31,7 +31,7 @@ private string GetComparableName(string name) {
31
31
return comparableNameLength == - 1 ? name : name . Substring ( 0 , comparableNameLength ) ;
32
32
}
33
33
34
- private string GetFlashpointProxyName ( bool active , string name , out string comparableName ) {
34
+ private string GetFlashpointProxyName ( string name , out string comparableName ) {
35
35
comparableName = null ;
36
36
37
37
if ( name == null ) {
@@ -57,15 +57,15 @@ private string GetFlashpointProxyName(bool active, string name, out string compa
57
57
FlashpointProxy . GetPreferences ( out bool proxy , out int port ) ;
58
58
59
59
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 ) ;
61
61
}
62
62
} else if ( comparableName . Equals ( FlashpointProxy . FP_PROXY_PORT , StringComparison . OrdinalIgnoreCase ) ) {
63
63
name = FlashpointProxy . FP_PROXY_PORT ;
64
64
65
65
FlashpointProxy . GetPreferences ( out bool proxy , out int port ) ;
66
66
67
67
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 ) ;
69
69
}
70
70
}
71
71
} catch ( SecurityException ex ) {
@@ -78,14 +78,14 @@ private string GetFlashpointProxyName(bool active, string name, out string compa
78
78
return name ;
79
79
}
80
80
81
- private string GetValue ( bool active , EnvironmentVariablesElement environmentVariablesElement ) {
81
+ private string GetValue ( EnvironmentVariablesElement environmentVariablesElement ) {
82
82
if ( String . IsNullOrEmpty ( environmentVariablesElement . Find ) ) {
83
83
return environmentVariablesElement . Value ;
84
84
}
85
85
86
86
string value = null ;
87
87
88
- string name = GetFlashpointProxyName ( active , environmentVariablesElement . Name , out string comparableName ) ;
88
+ string name = GetFlashpointProxyName ( environmentVariablesElement . Name , out string comparableName ) ;
89
89
90
90
if ( name == null ) {
91
91
return value ;
@@ -193,7 +193,7 @@ public override void Activate(string templateName) {
193
193
throw new ConfigurationErrorsException ( "The Environment Variables Element (" + i + ") is null while creating the Active Environment Variables Element." ) ;
194
194
}
195
195
196
- name = GetFlashpointProxyName ( true , environmentVariablesElement . Name , out comparableName ) ;
196
+ name = GetFlashpointProxyName ( environmentVariablesElement . Name , out comparableName ) ;
197
197
198
198
if ( name == null ) {
199
199
throw new InvalidEnvironmentVariablesException ( "The name is null while creating the Active Environment Variables Element." ) ;
@@ -233,7 +233,7 @@ public override void Activate(string templateName) {
233
233
throw new ConfigurationErrorsException ( "The Environment Variables Element (" + i + ") is null." ) ;
234
234
}
235
235
236
- name = GetFlashpointProxyName ( true , environmentVariablesElement . Name , out comparableName ) ;
236
+ name = GetFlashpointProxyName ( environmentVariablesElement . Name , out comparableName ) ;
237
237
238
238
if ( name == null ) {
239
239
throw new InvalidEnvironmentVariablesException ( "The name is null." ) ;
@@ -245,7 +245,7 @@ public override void Activate(string templateName) {
245
245
}
246
246
}
247
247
248
- value = GetValue ( true , environmentVariablesElement ) ;
248
+ value = GetValue ( environmentVariablesElement ) ;
249
249
250
250
try {
251
251
Environment . SetEnvironmentVariable ( name , Environment . ExpandEnvironmentVariables ( value ) , EnvironmentVariableTarget . Process ) ;
@@ -367,7 +367,7 @@ public void Deactivate(MODIFICATIONS_REVERT_METHOD modificationsRevertMethod) {
367
367
throw new InvalidEnvironmentVariablesException ( "The Environment Variable element (" + i + ") is null." ) ;
368
368
}
369
369
370
- name = GetFlashpointProxyName ( false , environmentVariablesElement . Name , out comparableName ) ;
370
+ name = GetFlashpointProxyName ( environmentVariablesElement . Name , out comparableName ) ;
371
371
372
372
if ( name == null ) {
373
373
throw new InvalidEnvironmentVariablesException ( "The name is null." ) ;
0 commit comments