rename environment variable for preference

tomysshadow · tomysshadow · commit 108cef65776c · 2023-11-01T06:17:52.000-06:00
diff --git a/FlashpointSecurePlayer/FlashpointProxy.cs b/FlashpointSecurePlayer/FlashpointProxy.cs
@@ -155,6 +155,8 @@ public static void GetPreferences(out bool proxy, out int port) {
                 portFile = flashpointProxyElement.Port;
             }
 
+            long preference = PREFERENCE_DEFAULT;
+
             // try getting from the proxy element
             // if that fails, try from the environment variables
             // if that fails, use the default
@@ -167,8 +169,8 @@ public static void GetPreferences(out bool proxy, out int port) {
                     // fail silently
                 }
 
-                if (long.TryParse(proxyEnvironmentVariable, out long _proxy) && _proxy != PREFERENCE_DEFAULT) {
-                    proxy = _proxy != 0;
+                if (long.TryParse(proxyEnvironmentVariable, out preference) && preference != PREFERENCE_DEFAULT) {
+                    proxy = preference != 0;
                 } else {
                     proxy = FP_PROXY_DEFAULT;
                 }
@@ -185,8 +187,8 @@ public static void GetPreferences(out bool proxy, out int port) {
                     // fail silently
                 }
 
-                if (long.TryParse(portEnvironmentVariable, out long _port) && _port != PREFERENCE_DEFAULT) {
-                    port = (int)_port;
+                if (long.TryParse(portEnvironmentVariable, out preference) && preference != PREFERENCE_DEFAULT) {
+                    port = (int)preference;
                 } else {
                     port = FP_PROXY_PORT_DEFAULT;
                 }

Original file line number	Diff line number	Diff line change
`@@ -155,6 +155,8 @@ public static void GetPreferences(out bool proxy, out int port) {`
`155`	`155`	`portFile = flashpointProxyElement.Port;`
`156`	`156`	`}`
`157`	`157`
	`158`	`+ long preference = PREFERENCE_DEFAULT;`
	`159`	`+`
`158`	`160`	`// try getting from the proxy element`
`159`	`161`	`// if that fails, try from the environment variables`
`160`	`162`	`// if that fails, use the default`
`@@ -167,8 +169,8 @@ public static void GetPreferences(out bool proxy, out int port) {`
`167`	`169`	`// fail silently`
`168`	`170`	`}`
`169`	`171`
`170`		`- if (long.TryParse(proxyEnvironmentVariable, out long _proxy) && _proxy != PREFERENCE_DEFAULT) {`
`171`		`- proxy = _proxy != 0;`
	`172`	`+ if (long.TryParse(proxyEnvironmentVariable, out preference) && preference != PREFERENCE_DEFAULT) {`
	`173`	`+ proxy = preference != 0;`
`172`	`174`	`} else {`
`173`	`175`	`proxy = FP_PROXY_DEFAULT;`
`174`	`176`	`}`
`@@ -185,8 +187,8 @@ public static void GetPreferences(out bool proxy, out int port) {`
`185`	`187`	`// fail silently`
`186`	`188`	`}`
`187`	`189`
`188`		`- if (long.TryParse(portEnvironmentVariable, out long _port) && _port != PREFERENCE_DEFAULT) {`
`189`		`- port = (int)_port;`
	`190`	`+ if (long.TryParse(portEnvironmentVariable, out preference) && preference != PREFERENCE_DEFAULT) {`
	`191`	`+ port = (int)preference;`
`190`	`192`	`} else {`
`191`	`193`	`port = FP_PROXY_PORT_DEFAULT;`
`192`	`194`	`}`