mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-09-29 23:32:33 +00:00
Code Issues 1 Projects Releases Wiki Activity

registry: Fix error handling in the registry loader

Browse source 
When the plugin-scanner load fails (because the helper can't be
spawned), make sure to load the plugin that failed in-process, so
that all plugins do get loaded.
This commit is contained in:
Jan Schmidt 2009-10-08 10:36:56 +01:00
parent 509e1fdf0e
commit f514ef0efc
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
gst/gstregistry.c
View file

@ -882,8 +882,10 @@ gst_registry_scan_plugin_file (GstRegistryScanContext * context,
context->helper = _priv_gst_plugin_loader_funcs.create (context->registry);
if (context->helper != NULL)
context->helper_state = REGISTRY_SCAN_HELPER_RUNNING;
else
else {
GST_WARNING ("Failed starting plugin scanner. Scanning in-process");
context->helper_state = REGISTRY_SCAN_HELPER_DISABLED;
}
}
if (context->helper_state == REGISTRY_SCAN_HELPER_RUNNING) {
@ -898,7 +900,10 @@ gst_registry_scan_plugin_file (GstRegistryScanContext * context,
"GST_PLUGIN_SCANNER environment variable gets set." : "");
context->helper_state = REGISTRY_SCAN_HELPER_DISABLED;
}
} else {
}
/* Check if the helper is disabled (or just got disabled above) */
if (context->helper_state == REGISTRY_SCAN_HELPER_DISABLED) {
/* Load plugin the old fashioned way... */
/* We don't use a GError here because a failure to load some shared