amy/MagicSetEditor2
1
0
Fork 0
mirror of https://github.com/amyinspace/MagicSetEditor2.git synced 2026-06-12 21:47:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

fixed: write_image_file failed with --export with relative path, because the is-relative-to-target-dir check was wrong

Browse Source
This commit is contained in:
Twan van Laarhoven
2020-04-21 00:13:23 +02:00
parent e72909f430
commit 59d59e97fd
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/script/functions/export.cpp
+1 -2
View File
@@ -44,7 +44,6 @@ String get_export_full_path(String& rel_name) {
if (!ei.allow_writes_outside) { if (!ei.allow_writes_outside) {
// check if path is okay // check if path is okay
wxFileName fn2(_("x")); wxFileName fn2(_("x"));
fn2.SetPath(ei.directory_absolute);
fn2.Normalize(wxPATH_NORM_ALL, ei.directory_absolute); fn2.Normalize(wxPATH_NORM_ALL, ei.directory_absolute);
String p1 = fn.GetFullPath(); String p1 = fn.GetFullPath();
String p2 = fn2.GetFullPath(); String p2 = fn2.GetFullPath();
@@ -53,7 +52,7 @@ String get_export_full_path(String& rel_name) {
throw ScriptError(_("Not a relative filename: ") + rel_name); throw ScriptError(_("Not a relative filename: ") + rel_name);
} }
} }
rel_name = fn.GetFullName(); rel_name = fn.GetFullName(); // TODO: does this work correctly with subdirectories in target dir?
return fn.GetFullPath(); return fn.GetFullPath();
} }