vw_small

commit 771233176fd108e0537c5dc5456c5c09cd8d1ef8
parent ed70b07d8184a6e5c3bb048af15386fb68b647c6
Author: James Hurst <james@jameshurst.ca>
Date:   Mon,  9 Nov 2020 21:50:35 -0500

Fix for negcached icons

Diffstat:
M
src/api/icons.rs
 | 
10
+++++-----

1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/api/icons.rs b/src/api/icons.rs
@@ -191,6 +191,11 @@ fn check_icon_domain_is_blacklisted(domain: &str) -> bool {
 fn get_icon(domain: &str) -> Option<Vec<u8>> {
     let path = format!("{}/{}.png", CONFIG.icon_cache_folder(), domain);
 
+    // Check for expiration of negatively cached copy
+    if icon_is_negcached(&path) {
+        return None;
+    }
+
     if let Some(icon) = get_cached_icon(&path) {
         return Some(icon);
     }
@@ -216,11 +221,6 @@ fn get_icon(domain: &str) -> Option<Vec<u8>> {
 }
 
 fn get_cached_icon(path: &str) -> Option<Vec<u8>> {
-    // Check for expiration of negatively cached copy
-    if icon_is_negcached(path) {
-        return None;
-    }
-
     // Check for expiration of successfully cached copy
     if icon_is_expired(path) {
         return None;