From 63f4ef97fbafb1b9868346f6b4f67f150baf442c Mon Sep 17 00:00:00 2001
From: Andrey Antukh <niwi@niwi.nz>
Date: Tue, 9 May 2023 12:47:33 +0200
Subject: [PATCH] :bug: Fix pointermap issue on file export

---
 backend/src/app/rpc/commands/binfile.clj | 2 +-
 backend/src/app/util/pointer_map.clj     | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/backend/src/app/rpc/commands/binfile.clj b/backend/src/app/rpc/commands/binfile.clj
index c37b9ae3d..8b9095756 100644
--- a/backend/src/app/rpc/commands/binfile.clj
+++ b/backend/src/app/rpc/commands/binfile.clj
@@ -300,7 +300,7 @@
     (binding [pmap/*load-fn* (partial files/load-pointer conn file-id)]
       (some-> (db/get* conn :file {:id file-id})
               (files/decode-row)
-              (update :data files/process-pointers deref)))))
+              (files/process-pointers deref)))))
 
 (def ^:private sql:file-media-objects
   "SELECT * FROM file_media_object WHERE id = ANY(?)")
diff --git a/backend/src/app/util/pointer_map.clj b/backend/src/app/util/pointer_map.clj
index 9124ed3c6..70da3dc8a 100644
--- a/backend/src/app/util/pointer_map.clj
+++ b/backend/src/app/util/pointer_map.clj
@@ -74,13 +74,15 @@
   IPointerMap
   (load! [_]
     (l/trace :hint "pointer-map:load" :id id)
-    (set! loaded? true)
 
     (when-not *load-fn*
       (throw (UnsupportedOperationException. "load is not supported when *load-fn* is not bind")))
 
     (when-let [data (*load-fn* id)]
       (set! odata data))
+
+    (set! loaded? true)
+
     (or odata {}))
 
   (modified? [_] modified?)