root
/
aseprite
mirror of https://github.com/aseprite/aseprite.git
1
0
Fork 0
Code Issues Actions 6 Packages Projects Releases Wiki Activity

[lua] Fix regression overwriting path specified in Dialog:file{filename} (fix #5061) 

If no 'basepath' is specified and the 'filename' argument has a path,
we must use that path as 'basepath' to keep backward compatibility
with the previous behavior of Dialog:file{}.
This commit is contained in:
David Capello 2025-05-22 14:39:36 -03:00
parent 79de4da82a
commit f1b6dd8594
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/app/script/dialog_class.cpp
View File

@ -1,5 +1,5 @@
// Aseprite
// Copyright (C) 2018-2024 Igara Studio S.A.
// Copyright (C) 2018-2025 Igara Studio S.A.
// Copyright (C) 2018 David Capello
//
// This program is distributed under the terms of
@ -1048,7 +1048,7 @@ int Dialog_shades(lua_State* L)
int Dialog_file(lua_State* L)
{
std::string title = "Open File";
std::string path = std::string();
std::string path;
std::string fn;
base::paths exts;
auto dlgType = FileSelectorType::Open;
@ -1114,11 +1114,14 @@ int Dialog_file(lua_State* L)
// Set default path if 'basepath' is blank
if (path.empty()) {
const auto* doc = App::instance()->context()->activeDocument();
if (doc)
path = base::get_file_path(doc->filename());
else
path = (base::get_file_path(fn).empty() ? base::get_current_path() : base::get_file_path(fn));
// We use the 'filename' path the relative path if it was given.
path = base::get_file_path(fn);
if (path.empty()) {
if (const auto* doc = App::instance()->context()->activeDocument())
path = base::get_file_path(doc->filename());
else
path = base::get_current_path();
}
}
// Update the widget with the provided filename