From e51967d8d4db724f59965ae93bc6ff0b6bd9f744 Mon Sep 17 00:00:00 2001
From: David Peer <david.peer@outlook.com>
Date: Sun, 26 Jun 2022 12:57:33 +0200
Subject: [PATCH] Improvements

---
 apps/ha/custom.html | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/apps/ha/custom.html b/apps/ha/custom.html
index f1597d740..f5021f6b6 100644
--- a/apps/ha/custom.html
+++ b/apps/ha/custom.html
@@ -14,21 +14,25 @@
          * Load trigger from BangleJs
          */
         console.log("Loading trigger from BangleJs...");
+        var loadedData = false;
         try {
             Puck.eval(`require("Storage").read(${JSON.stringify("ha.trigger.json")})`,data=>{
                 document.getElementById("triggers").innerHTML = data;
                 console.log("Successfully loaded trigger from BangleJs.");
                 console.log(data);
+                loadedData = true;
             });
-        } catch(ex) {
-            console.log("(Warning) Could not load trigger from BangleJs.");
-            console.log(ex);
-            document.getElementById("triggers").innerHTML = `
+        } finally {
+            if(!loadedData){
+                console.log("(Warning) Could not load trigger from BangleJs.");
+                console.log(ex);
+                document.getElementById("triggers").innerHTML = `
 [
   {"display": "Open", "trigger": "OPEN_DOOR", "icon":"door"},
   {"display": "Office", "trigger": "TOGGLE_LIGHT", "icon":"light"},
   {"display": "Living Room", "trigger": "OVEN", "icon":"fire"}
 ]`
+            }
         }
 
         /*