Send loaditem before dataadd/update, fixes #1861

ivmartel · Feb 3, 2025 · 57dae53 · 57dae53
1 parent 09c9b95
commit 57dae53
Showing 1 changed file with 16 additions and 16 deletions.
diff --git a/src/app/application.js b/src/app/application.js
@@ -1655,23 +1655,8 @@ export class App {
       logger.error('Missing loaditem event load type.');
     }
 
-    const isFirstLoadItem = event.isfirstitem;
-
-    let eventMetaData = null;
-    if (event.loadtype === 'image') {
-      if (isFirstLoadItem) {
-        this.#dataController.add(event.dataid, event.data);
-      } else {
-        this.#dataController.update(event.dataid, event.data);
-      }
-      eventMetaData = event.data.meta;
-    } else if (event.loadtype === 'state') {
-      this.applyJsonState(event.data, event.dataid);
-      eventMetaData = 'state';
-    }
-
     /**
-     * Load item event: fired when a load item is successfull.
+     * Load item event: fired when an item has been successfully loaded.
      *
      * @event App#loaditem
      * @type {object}
@@ -1691,6 +1676,21 @@ export class App {
       warn: event.warn
     });
 
+    const isFirstLoadItem = event.isfirstitem;
+
+    let eventMetaData = null;
+    if (event.loadtype === 'image') {
+      if (isFirstLoadItem) {
+        this.#dataController.add(event.dataid, event.data);
+      } else {
+        this.#dataController.update(event.dataid, event.data);
+      }
+      eventMetaData = event.data.meta;
+    } else if (event.loadtype === 'state') {
+      this.applyJsonState(event.data, event.dataid);
+      eventMetaData = 'state';
+    }
+
     // update overlay data if present
     if (typeof this.#overlayDatas !== 'undefined' &&
       typeof this.#overlayDatas[event.dataid] !== 'undefined') {