From c32990dff19c17936a6b55085f9b1b513b37e39d Mon Sep 17 00:00:00 2001
From: Marvin W <git@larma.de>
Date: Tue, 11 Jun 2019 14:45:26 +0200
Subject: Ensure avatars are not loaded multiple times

---
 libdino/src/service/avatar_manager.vala | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'libdino/src/service/avatar_manager.vala')

diff --git a/libdino/src/service/avatar_manager.vala b/libdino/src/service/avatar_manager.vala
index c9c078ab..a47273ee 100644
--- a/libdino/src/service/avatar_manager.vala
+++ b/libdino/src/service/avatar_manager.vala
@@ -23,6 +23,7 @@ public class AvatarManager : StreamInteractionModule, Object {
     private HashMap<Jid, string> vcard_avatars = new HashMap<Jid, string>(Jid.hash_func, Jid.equals_func);
     private AvatarStorage avatar_storage = new AvatarStorage(get_storage_dir());
     private HashMap<string, Pixbuf> cached_pixbuf = new HashMap<string, Pixbuf>();
+    private HashMap<string, Gee.List<SourceFuncWrapper>> pending_pixbuf = new HashMap<string, Gee.List<SourceFuncWrapper>>();
     private const int MAX_PIXEL = 192;
 
     public static void start(StreamInteractor stream_interactor, Database db) {
@@ -50,12 +51,21 @@ public class AvatarManager : StreamInteractionModule, Object {
         if (cached_pixbuf.has_key(hash)) {
             return cached_pixbuf[hash];
         }
+        if (pending_pixbuf.has_key(hash)) {
+            pending_pixbuf[hash].add(new SourceFuncWrapper(get_avatar_by_hash.callback));
+            yield;
+            return cached_pixbuf[hash];
+        }
+        pending_pixbuf[hash] = new ArrayList<SourceFuncWrapper>();
         Pixbuf? image = yield avatar_storage.get_image(hash);
         if (image != null) {
             cached_pixbuf[hash] = image;
         } else {
             db.avatar.delete().with(db.avatar.hash, "=", hash).perform();
         }
+        foreach (SourceFuncWrapper sfw in pending_pixbuf[hash]) {
+            sfw.sfun();
+        }
         return image;
     }
 
-- 
cgit v1.2.3-54-g00ecf