ActiveX Imports: set current directory earlier

Author: tomysshadow

FlashpointSecurePlayer/FlashpointSecurePlayerGUI.cs

@@ -314,6 +314,15 @@ private async Task ImportActiveX(ErrorDelegate errorDelegate) {
                     ProgressManager.CurrentGoal.Start(6);
 
                     try {
+                        // fix for loading dependencies
+                        try {
+                            Directory.SetCurrentDirectory(Path.GetFullPath(TemplateName));
+                        } catch (Exception ex) {
+                            LogExceptionToLauncher(ex);
+                            errorDelegate(String.Format(Properties.Resources.GameIsMissingFiles, TemplateName));
+                            throw new ActiveXImportFailedException("The ActiveX Import failed because setting the Current Directory failed.");
+                        }
+
                         ActiveXControl activeXControl = null;
 
                         try {

FlashpointSecurePlayer/Properties/AssemblyInfo.cs

@@ -33,7 +33,7 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.1.3.0")]
-[assembly: AssemblyFileVersion("2.1.3.0")]
+[assembly: AssemblyVersion("2.1.4.0")]
+[assembly: AssemblyFileVersion("2.1.4.0")]
 [assembly: NeutralResourcesLanguage("en")]
 

FlashpointSecurePlayer/README.md

@@ -1,4 +1,4 @@
-# Flashpoint Secure Player 2.1.3
+# Flashpoint Secure Player 2.1.4
 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.
 
 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/RegistryStates.cs

@@ -756,15 +756,6 @@ public async Task StartImportAsync(string templateName, BINARY_TYPE binaryType)
                 throw new ArgumentException("The path to \"" + TemplateName + "\" is not supported.");
             }
 
-            // fix for loading dependencies
-            try {
-                Directory.SetCurrentDirectory(fullPath);
-            } catch (SecurityException) {
-                throw new TaskRequiresElevationException("Setting the Current Directory requires elevation.");
-            } catch {
-                // Fail silently.
-            }
-
             // check permission to run
             if (!TraceEventSession.IsElevated().GetValueOrDefault()) {
                 throw new TaskRequiresElevationException("The Trace Event Session requires elevation.");