mirrors/fltk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix "Fl_Plugin_Manager::loadAll doesn't work correct" (#876)

Browse Source
This commit is contained in:
ManoloFLTK 2023-12-21 17:12:13 +01:00
parent e466fe20c8
commit fcf91e51c0
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Fl_Preferences.cxx
View File

@ -1981,12 +1981,14 @@ int Fl_Plugin_Manager::load(const char *filename) {
\brief Use this function to load a whole directory full of modules. \brief Use this function to load a whole directory full of modules.
*/ */
int Fl_Plugin_Manager::loadAll(const char *filepath, const char *pattern) { int Fl_Plugin_Manager::loadAll(const char *filepath, const char *pattern) {
if (!filepath || strlen(filepath) < 1) return -1;
const char *format = (filepath[strlen(filepath) - 1] == '/' ? "%s%s" : "%s/%s");
struct dirent **dir; struct dirent **dir;
int i, n = fl_filename_list(filepath, &dir); int i, n = fl_filename_list(filepath, &dir);
for (i=0; i<n; i++) { for (i=0; i<n; i++) {
struct dirent *e = dir[i]; struct dirent *e = dir[i];
if (pattern==0 || fl_filename_match(e->d_name, pattern)) { if (pattern==0 || fl_filename_match(e->d_name, pattern)) {
load(Fl_Preferences::Name("%s%s", filepath, e->d_name)); load(Fl_Preferences::Name(format, filepath, e->d_name));
} }
free(e); free(e);
} }