From f588c0be73b3b67146e3627976c1e4b44506dc5e Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Fri, 8 May 2015 12:54:06 -0400 Subject: [PATCH] image_cache_task::new_image_cache_task() should not panic when placeholder fails to load now we just print a message and continue --- components/net/image_cache_task.rs | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/components/net/image_cache_task.rs b/components/net/image_cache_task.rs index b0b488386bf..17f9d5de04b 100644 --- a/components/net/image_cache_task.rs +++ b/components/net/image_cache_task.rs @@ -331,14 +331,21 @@ pub fn new_image_cache_task(resource_task: ResourceTask) -> ImageCacheTask { let mut placeholder_url = resources_dir_path(); // TODO (Savago): replace for a prettier one. placeholder_url.push("rippy.jpg"); - let url = Url::from_file_path(&*placeholder_url).unwrap(); - let placeholder_image = match load_whole_resource(&resource_task, url) { - Err(..) => { - debug!("image_cache_task: failed loading the placeholder."); - None + let placeholder_image = match Url::from_file_path(&*placeholder_url) { + Ok(url) => { + match load_whole_resource(&resource_task, url) { + Err(..) => { + debug!("image_cache_task: failed loading the placeholder."); + None + } + Ok((_, image_data)) => { + Some(Arc::new(load_from_memory(&image_data).unwrap())) + } + } } - Ok((_, image_data)) => { - Some(Arc::new(load_from_memory(&image_data).unwrap())) + Err(..) => { + debug!("image_cache_task: url {}", placeholder_url.display()); + None } };