mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2024-10-03 05:22:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix extensions wrongly being detected as "built-in" (#4625)

Browse Source
This commit is contained in:
Christian Kaiser 2024-09-04 15:42:47 -03:00 committed by GitHub
parent 5798e27993
commit d62d279a34
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/app/app_menus.cpp
View File

@ -391,9 +391,8 @@ void AppMenus::reload()
#ifdef ENABLE_SCRIPTING #ifdef ENABLE_SCRIPTING
// Load scripts // Load scripts
ResourceFinder rf; ResourceFinder rf;
rf.includeUserDir("scripts/."); rf.includeUserDir("scripts");
std::string scriptsDir = rf.getFirstOrCreateDefault(); std::string scriptsDir = rf.getFirstOrCreateDefault();
scriptsDir = base::get_file_path(scriptsDir);
if (base::is_directory(scriptsDir)) { if (base::is_directory(scriptsDir)) {
loadScriptsSubmenu(scriptsMenu->getSubmenu(), scriptsDir, true); loadScriptsSubmenu(scriptsMenu->getSubmenu(), scriptsDir, true);
} }

11
src/app/extensions.cpp
View File

@ -794,7 +794,7 @@ Extensions::Extensions()
// Create and get the user extensions directory // Create and get the user extensions directory
{ {
ResourceFinder rf2; ResourceFinder rf2;
rf2.includeUserDir("extensions/."); rf2.includeUserDir("extensions");
m_userExtensionsPath = rf2.getFirstOrCreateDefault(); m_userExtensionsPath = rf2.getFirstOrCreateDefault();
m_userExtensionsPath = base::normalize_path(m_userExtensionsPath); m_userExtensionsPath = base::normalize_path(m_userExtensionsPath);
if (!m_userExtensionsPath.empty() && if (!m_userExtensionsPath.empty() &&
@ -811,10 +811,12 @@ Extensions::Extensions()
// Load extensions from data/ directory on all possible locations // Load extensions from data/ directory on all possible locations
// (installed folder and user folder) // (installed folder and user folder)
while (rf.next()) { while (rf.next()) {
auto extensionsDir = rf.filename(); const auto& extensionsDir = rf.filename();
if (base::is_directory(extensionsDir)) { if (!base::is_directory(extensionsDir))
for (auto fn : base::list_files(extensionsDir)) { continue;
for (auto& fn : base::list_files(extensionsDir)) {
const auto dir = base::join_path(extensionsDir, fn); const auto dir = base::join_path(extensionsDir, fn);
if (!base::is_directory(dir)) if (!base::is_directory(dir))
continue; continue;
@ -841,7 +843,6 @@ Extensions::Extensions()
} }
} }
} }
}
Extensions::~Extensions() Extensions::~Extensions()
{ {