From dc0770bfa69d90eb7b4afd22436bcf1435284375 Mon Sep 17 00:00:00 2001 From: Thibault Saunier Date: Mon, 3 Nov 2014 11:55:29 +0100 Subject: [PATCH] uri-asset: Ensure that UriAssets loaded with error are remembered --- ges/ges-uri-asset.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/ges/ges-uri-asset.c b/ges/ges-uri-asset.c index 72d5d63..5db0b81 100644 --- a/ges/ges-uri-asset.c +++ b/ges/ges-uri-asset.c @@ -33,6 +33,7 @@ #include "ges-track-element-asset.h" static GHashTable *parent_newparent_table = NULL; + static void initable_iface_init (GInitableIface * initable_iface) { @@ -491,6 +492,10 @@ ges_uri_clip_asset_request_sync (const gchar * uri, GError ** error) info = gst_discoverer_discover_uri (discoverer, uri, &lerror); } + ges_asset_cache_put (gst_object_ref (asset), NULL); + ges_uri_clip_asset_set_info (asset, info); + ges_asset_cache_set_loaded (GES_TYPE_URI_CLIP, uri, lerror); + if (info == NULL || lerror != NULL) { gst_object_unref (asset); if (lerror) @@ -499,10 +504,6 @@ ges_uri_clip_asset_request_sync (const gchar * uri, GError ** error) return NULL; } - ges_asset_cache_put (gst_object_ref (asset), NULL); - ges_uri_clip_asset_set_info (asset, info); - ges_asset_cache_set_loaded (GES_TYPE_URI_CLIP, uri, lerror); - return asset; } -- 2.7.4