Merge remote-tracking branch 'origin/next' into next

This commit is contained in:
Dave Davenport 2022-12-31 20:12:04 +01:00
commit da713a8ec0

View file

@ -1087,7 +1087,8 @@ char *helper_get_theme_path(const char *file, const char **ext) {
if (ext_found) { if (ext_found) {
filename = g_strdup(file); filename = g_strdup(file);
} else { } else {
filename = g_strconcat(file, ext, NULL); // TODO: Pick the first extension. needs fixing.
filename = g_strconcat(file, ext[0], NULL);
} }
// Check config's themes directory. // Check config's themes directory.
const char *cpath = g_get_user_config_dir(); const char *cpath = g_get_user_config_dir();