use same working directory behaviour under Old CPU Simulator as normal

Author: tomysshadow

FlashpointSecurePlayer/FlashpointSecurePlayerConfigs/3dgroovegx.config

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <configSections>
-    <section name="flashpointSecurePlayer" type="FlashpointSecurePlayer.Shared+FlashpointSecurePlayerSection, FlashpointSecurePlayer, Version=2.0.0.0, Culture=neutral, PublicKeyToken=null" />
+    <section name="flashpointSecurePlayer" type="FlashpointSecurePlayer.Shared+FlashpointSecurePlayerSection, FlashpointSecurePlayer, Version=2.1.4.0, Culture=neutral, PublicKeyToken=null" />
   </configSections>
 
   <flashpointSecurePlayer>

FlashpointSecurePlayer/FlashpointSecurePlayerConfigs/3dgroovegxandup.config

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <configSections>
-    <section name="flashpointSecurePlayer" type="FlashpointSecurePlayer.Shared+FlashpointSecurePlayerSection, FlashpointSecurePlayer, Version=2.0.0.0, Culture=neutral, PublicKeyToken=null" />
+    <section name="flashpointSecurePlayer" type="FlashpointSecurePlayer.Shared+FlashpointSecurePlayerSection, FlashpointSecurePlayer, Version=2.1.4.0, Culture=neutral, PublicKeyToken=null" />
   </configSections>
 
   <flashpointSecurePlayer>

FlashpointSecurePlayer/OldCPUSimulator.cs

@@ -143,6 +143,7 @@ public void Activate(string templateName, ref ProcessStartInfo softwareProcessSt
                 // USB the HDMI to .exe the database
                 string commandLineExpanded = Environment.ExpandEnvironmentVariables(modeElement.CommandLine);
                 StringBuilder oldCPUSimulatorSoftware = new StringBuilder();
+                string workingDirectory = null;
 
                 // the problem we're dealing with here
                 // is that we need to get the full path to
@@ -158,6 +159,7 @@ public void Activate(string templateName, ref ProcessStartInfo softwareProcessSt
                     }
 
                     string fullPath = Path.GetFullPath(argv[0]);
+                    workingDirectory = Path.GetDirectoryName(fullPath);
                     GetValidArgument(ref fullPath);
                     oldCPUSimulatorSoftware.Append(fullPath);
                 } catch (Exception ex) {
@@ -189,7 +191,11 @@ public void Activate(string templateName, ref ProcessStartInfo softwareProcessSt
                 // default the working directory to here
                 // (otherwise it'd get set to Old CPU Simulator's directory, not desirable)
                 if (String.IsNullOrEmpty(modeElement.WorkingDirectory)) {
-                    softwareProcessStartInfo.WorkingDirectory = Environment.CurrentDirectory;
+                    if (String.IsNullOrEmpty(workingDirectory)) {
+                        softwareProcessStartInfo.WorkingDirectory = Environment.CurrentDirectory;
+                    } else {
+                        softwareProcessStartInfo.WorkingDirectory = workingDirectory;
+                    }
                 }
                 return;
             }