summaryrefslogtreecommitdiff
path: root/ges
diff options
context:
space:
mode:
authorThibault Saunier <tsaunier@gnome.org>2014-11-03 11:55:29 +0100
committerThibault Saunier <tsaunier@gnome.org>2014-12-06 10:34:15 +0100
commitdc0770bfa69d90eb7b4afd22436bcf1435284375 (patch)
tree2bd36995fd62b49c95cbb932e81159d3681d3ea7 /ges
parent55c88a726e7389f446047e286fd9d2af612ac604 (diff)
uri-asset: Ensure that UriAssets loaded with error are remembered
Diffstat (limited to 'ges')
-rw-r--r--ges/ges-uri-asset.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/ges/ges-uri-asset.c b/ges/ges-uri-asset.c
index 72d5d63d..5db0b810 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;
}