[FlashpointInstaller] Improve destination path handling

Author: WumboSpasm

FlashpointInstaller/src/Common.cs

@@ -160,21 +160,6 @@ public static bool RedistInstalled
                 get => Registry.LocalMachine.OpenSubKey("SOFTWARE\\WOW6432Node\\Microsoft\\VisualStudio\\14.0\\VC\\Runtimes\\X86") != null;
             }
 
-            // Pointer to destination path textbox
-            private static string destinationPath = Path.Combine(Path.GetPathRoot(AppDomain.CurrentDomain.BaseDirectory), "Flashpoint");
-            public static string DestinationPath
-            {
-                get { return destinationPath; }
-                set
-                {
-                    if (VerifyDestinationPath(value))
-                    {
-                        destinationPath = value;
-                        Main.DestinationPath.Text = destinationPath;
-                    }
-                }
-            }
-
             // Object for tracking numerous file size sums
             public static class SizeTracker
             {

FlashpointInstaller/src/Forms/Finish.cs

@@ -18,7 +18,7 @@ private void FinishDownload_Exit(object sender, EventArgs e)
                 var flashpointProcess = new Process();
                 flashpointProcess.StartInfo.UseShellExecute = true;
                 flashpointProcess.StartInfo.FileName = "Flashpoint.exe";
-                flashpointProcess.StartInfo.WorkingDirectory = Path.Combine(FPM.DestinationPath, "Launcher");
+                flashpointProcess.StartInfo.WorkingDirectory = Path.Combine(FPM.Main.DestinationPath.Text, "Launcher");
                 flashpointProcess.Start();
             }
 

FlashpointInstaller/src/Forms/Main.cs

@@ -34,7 +34,7 @@ private void Main_Load(object sender, EventArgs e)
                 Environment.Exit(1);
             }
 
-            DestinationPath.Text = FPM.DestinationPath;
+            DestinationPath.Text = Path.Combine(Path.GetPathRoot(AppDomain.CurrentDomain.BaseDirectory), "Flashpoint");
         }
 
         private void Link_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
@@ -89,18 +89,24 @@ private void DestinationPathBrowse_Click(object _, EventArgs e)
 
             if (pathDialog.ShowDialog() == CommonFileDialogResult.Ok)
             {
-                FPM.DestinationPath = Path.Combine(pathDialog.FileName, "Flashpoint");
+                string path = Path.Combine(pathDialog.FileName, "Flashpoint");
+
+                if (FPM.VerifyDestinationPath(path)) DestinationPath.Text = path;
             }
         }
 
         private void DestinationPath_KeyPress(object sender, KeyPressEventArgs e)
         {
-            if (e.KeyChar == (char)Keys.Return) DownloadButton_Click(this, e);
+            if (e.KeyChar == (char)Keys.Return)
+            {
+                DownloadButton_Click(this, e);
+                e.Handled = true;
+            }
         }
 
         private void DownloadButton_Click(object sender, EventArgs e)
         {
-            if (!FPM.VerifyDestinationPath(FPM.DestinationPath)) return;
+            if (!FPM.VerifyDestinationPath(DestinationPath.Text)) return;
 
             FPM.CheckDependencies();
 

FlashpointInstaller/src/Forms/Operate.cs

@@ -136,8 +136,8 @@ private void OnDownloadFileCompleted(object sender, System.ComponentModel.AsyncC
 
         private void ExtractComponents()
         {
-            string rootPath = FPM.DestinationPath;
-            string infoPath = Path.Combine(rootPath, "Components");
+            string rootPath = FPM.Main.DestinationPath.Text;
+            string infoPath = Path.Combine(FPM.Main.DestinationPath.Text, "Components");
             string infoFile = Path.Combine(infoPath, $"{workingComponent.ID}.txt");
 
             Directory.CreateDirectory(infoPath);
@@ -231,8 +231,8 @@ await Task.Run(() =>
                 foreach (string path in shortcutPaths)
                 {
                     var shortcut = new IWshRuntimeLibrary.WshShell().CreateShortcut(Path.Combine(path, "Flashpoint.lnk"));
-                    shortcut.TargetPath = Path.Combine(FPM.DestinationPath, "Launcher", "Flashpoint.exe");
-                    shortcut.WorkingDirectory = Path.Combine(FPM.DestinationPath, "Launcher");
+                    shortcut.TargetPath = Path.Combine(FPM.Main.DestinationPath.Text, "Launcher", "Flashpoint.exe");
+                    shortcut.WorkingDirectory = Path.Combine(FPM.Main.DestinationPath.Text, "Launcher");
                     shortcut.Description = "Shortcut to Flashpoint";
                     shortcut.Save();
                 }
@@ -259,14 +259,14 @@ await Task.Run(() =>
             {
                 while (cancelStatus != 2) { }
 
-                if (Directory.Exists(FPM.DestinationPath))
+                if (Directory.Exists(FPM.Main.DestinationPath.Text))
                 {
-                    foreach (string file in Directory.EnumerateFiles(FPM.DestinationPath))
+                    foreach (string file in Directory.EnumerateFiles(FPM.Main.DestinationPath.Text))
                     {
                         try { File.Delete(file); } catch { }
                     }
 
-                    try { Directory.Delete(FPM.DestinationPath, true); } catch { }
+                    try { Directory.Delete(FPM.Main.DestinationPath.Text, true); } catch { }
                 }
             });