mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-06 13:30:01 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

media-session: fix config load path

Browse source 
config_dir is the new MEDIA_SESSION_CONFIG_DIR environment variable (if
set), impl.config_dir is that or the fallback, whichever applies.

Fixes 00bd3b5b59
Fixes #1725
This commit is contained in:
Peter Hutterer 2021-10-18 11:18:22 +10:00 • committed by Wim Taymans
parent 6f74dc1375
commit 56f01a293c
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/media-session/media-session.c
View file

@ -2523,7 +2523,7 @@ int main(int argc, char *argv[])
if ((impl.conf = pw_properties_new(NULL, NULL)) == NULL) if ((impl.conf = pw_properties_new(NULL, NULL)) == NULL)
return 1; return 1;
pw_conf_load_conf(config_dir, config_name, impl.conf); pw_conf_load_conf(impl.config_dir, config_name, impl.conf);
if ((str = pw_properties_get(impl.conf, "context.properties")) != NULL) if ((str = pw_properties_get(impl.conf, "context.properties")) != NULL)
pw_properties_update_string(impl.this.props, str, strlen(str)); pw_properties_update_string(impl.this.props, str, strlen(str));