Fixed ChangeExportPath button in ExportAllTextures form

pavledev · Jul 5, 2020 · b52e23f · b52e23f
1 parent 4e8423c
commit b52e23f
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 13 deletions.
diff --git a/GlacierTEXEditor/ExportAllTextures.cs b/GlacierTEXEditor/ExportAllTextures.cs
@@ -18,8 +18,9 @@ public partial class ExportAllTextures : Form
         private bool checkSelectedDimensions = false;
         private int previousIndex = 0;
         private readonly List<string> extensions = new List<string>() { ".dds", ".tga", ".bmp", ".png", ".jpg" };
+        private Form1 form1;
 
-        public ExportAllTextures()
+        public ExportAllTextures(Form1 form1)
         {
             InitializeComponent();
 
@@ -51,6 +52,8 @@ public ExportAllTextures()
             chkExportAsSingleFile.Visible = false;
 
             ExportPath = Path.GetDirectoryName(Application.ExecutablePath) + @"\";
+
+            this.form1 = form1;
         }
 
         public List<Texture> Textures
@@ -426,18 +429,9 @@ private void BtnSelectAllExtensionTypes_Click(object sender, EventArgs e)
 
         private void BtnChangeExportPath_Click(object sender, EventArgs e)
         {
-            OpenFileDialog openFileDialog = new OpenFileDialog();
-
-            openFileDialog.ValidateNames = false;
-            openFileDialog.CheckFileExists = false;
-            openFileDialog.CheckPathExists = true;
-            openFileDialog.FileName = "Folder Selection.";
+            Invoke(new Action(() => ExportPath = form1.ShowOpenFileDialog()));
 
-            if (openFileDialog.ShowDialog() == DialogResult.OK)
-            {
-                ExportPath = Path.GetDirectoryName(openFileDialog.FileName);
-                txtExportPath.Text = ExportPath;
-            }
+            txtExportPath.Text = ExportPath;
         }
 
         private void CheckBox_CheckedChanged(object sender, EventArgs e)

diff --git a/GlacierTEXEditor/Form1.cs b/GlacierTEXEditor/Form1.cs
@@ -124,6 +124,27 @@ private void Form1_Load(object sender, EventArgs e)
             }
         }
 
+        public string ShowOpenFileDialog()
+        {
+            OpenFileDialog openFileDialog = new OpenFileDialog();
+
+            openFileDialog.ValidateNames = false;
+            openFileDialog.CheckFileExists = false;
+            openFileDialog.CheckPathExists = true;
+            openFileDialog.FileName = "Folder Selection.";
+
+            DialogResult dialogResult = DialogResult.Cancel;
+
+            Invoke(new Action(() => dialogResult = openFileDialog.ShowDialog()));
+
+            if (dialogResult == DialogResult.OK)
+            {
+                return Path.GetDirectoryName(openFileDialog.FileName);
+            }
+
+            return null;
+        }
+
         private void BtnChangeDirectory_Click(object sender, EventArgs e)
         {
             OpenFileDialog openFileDialog = new OpenFileDialog();
@@ -2560,7 +2581,7 @@ private void ExportAllFiles()
         {
             toolStripStatusLabel1.Text = "Exporting all textures...";
 
-            using (ExportAllTextures exportAllTextures = new ExportAllTextures())
+            using (ExportAllTextures exportAllTextures = new ExportAllTextures(this))
             {
                 exportAllTextures.Textures = textures;
                 DialogResult dialogResult = exportAllTextures.ShowDialog();