Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Dmitri Kourennyi 2019-04-01 15:47:56 -04:00
commit 273d4be3c6
37 changed files with 550 additions and 135 deletions

View file

@ -348,6 +348,9 @@ void init_themes(list_t **themes, list_t **basedirs) {
*themes = create_list();
for (int i = 0; i < (*basedirs)->length; ++i) {
list_t *dir_themes = load_themes_in_dir((*basedirs)->items[i]);
if (dir_themes == NULL) {
continue;
}
list_cat(*themes, dir_themes);
list_free(dir_themes);
}