gst/gstplugin.c: Fix plugin loading if plugin/lib was already loaded. Fixes #163383

Original commit message from CVS:
* gst/gstplugin.c: (gst_plugin_load):
Fix plugin loading if plugin/lib was already loaded. Fixes
#163383

diff --git a/ChangeLog b/ChangeLog
index ea20bd3..31e011b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-01-09  Stephane LOEUILLET  <stephane.loeuillet@tiscali.fr>
+
+       * gst/gstplugin.c: (gst_plugin_load):
+         Fix plugin loading if plugin/lib was already loaded. Fixes
+         #163383
+
 2005-01-09  Sebastien Cote  <sc5@hermes.usherb.ca>
 
        Reviewed by:  Ronald S. Bultje  <rbultje@ronald.bitfreak.net>

diff --git a/gst/gstplugin.c b/gst/gstplugin.c
index 34c5143..231d7dd 100644 (file)
--- a/gst/gstplugin.c
+++ b/gst/gstplugin.c
@@ -872,8 +872,8 @@ gst_plugin_load (const gchar * name)
 
   plugin = gst_registry_pool_find_plugin (name);
   if (plugin) {
-    gst_plugin_load_file (plugin->filename, &error);
-    if (error) {
+    plugin = gst_plugin_load_file (plugin->filename, &error);
+    if (!plugin) {
       GST_WARNING ("load_plugin error: %s\n", error->message);
       g_error_free (error);
       return FALSE;
@@ -892,7 +892,7 @@ gst_plugin_load (const gchar * name)
  * Load the named library.  Name should be given as
  * "liblibrary.so". (exception to this rule is 'riff', which .so name is 'gstriff')
  *
- * Returns: whether the library was loaded or not (and return FALSE if it was already loaded)
+ * Returns: whether the library was loaded or not (and returns TRUE if it was already loaded)
  */
 gboolean
 gst_library_load (const gchar * name)