tribufu/ServerGridEditor
1
0
Fork 0
mirror of https://github.com/tribufu/ServerGridEditor synced 2026-05-06 15:17:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix for foreground image selection crash

Browse source
This commit is contained in:
GrapeshotGames 2019-02-01 16:33:45 -05:00
parent 8b2900fa6b
commit 534c3a5abc
2 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
ServerGridEditor.exe
View file

Binary file not shown.

13
Src/ServerGridEditor/Forms/MainForm.cs
View file

@ -2343,19 +2343,22 @@ namespace ServerGridEditor
openFileDialog.Filter = "png files (*.png)|*.png"; openFileDialog.Filter = "png files (*.png)|*.png";
openFileDialog.InitialDirectory = GlobalSettings.Instance.BaseDir + foregroundTilesDir.Replace("./", ""); openFileDialog.InitialDirectory = GlobalSettings.Instance.BaseDir + foregroundTilesDir.Replace("./", "");
openFileDialog.FileName = string.IsNullOrEmpty(currentProject.foregroundImgPath) ? "" : Path.GetFileName(currentProject.foregroundImgPath);
if (openFileDialog.ShowDialog() == DialogResult.OK) if (openFileDialog.ShowDialog() == DialogResult.OK)
{ {
string imgName = foregroundTilesDir;// + "/" + currentProject.SeamlessWorldId;
if (foregroundBrush != null) if (foregroundBrush != null)
foregroundBrush.Dispose(); foregroundBrush.Dispose();
if (foreground != null) if (foreground != null)
foreground.Dispose(); foreground.Dispose();
File.Copy(openFileDialog.FileName, imgName, true);
SetForegroundImage(openFileDialog.FileName); string imgPath= Path.Combine(foregroundTilesDir, Path.GetFileName(openFileDialog.FileName));
if (!openFileDialog.FileName.StartsWith(Path.GetFullPath(foregroundTilesDir)))
File.Copy(openFileDialog.FileName, imgPath, true);
SetForegroundImage(imgPath);
currentProject.showForeground = true; currentProject.showForeground = true;
currentProject.foregroundImgPath = imgName; currentProject.foregroundImgPath = imgPath;
showForegroundChckBox.Checked = true; showForegroundChckBox.Checked = true;
} }
} }