From 2c79b06be561472e4cd9f070fa60a089ce140c7e Mon Sep 17 00:00:00 2001
From: Martin Boonk <martin@boonk.info>
Date: Mon, 3 Oct 2022 16:56:41 +0200
Subject: [PATCH] imageclock - Move loadWidgets to after setUI

---
 apps/imageclock/app.js | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/apps/imageclock/app.js b/apps/imageclock/app.js
index 2a175a35c..1d4017111 100644
--- a/apps/imageclock/app.js
+++ b/apps/imageclock/app.js
@@ -4,6 +4,7 @@ let showWidgets = false;
 let firstDraw = true;
 
 {
+
   let watchface = require("Storage").readJSON("imageclock.face.json");
   let watchfaceResources = require("Storage").readJSON("imageclock.resources.json");
   let precompiledJs = eval(require("Storage").read("imageclock.draw.js"));
@@ -80,7 +81,7 @@ let firstDraw = true;
       }
     };
   }
-  
+
   let delayTimeouts = [];
 
   function delay(t) {
@@ -567,7 +568,7 @@ let firstDraw = true;
   let drawingTime;
 
   let start;
-  
+
   let deferredTimout;
 
   function initialDraw(resources, face){
@@ -675,7 +676,7 @@ let firstDraw = true;
 
   let initialDrawTimeoutUnlocked;
   let initialDrawTimeoutLocked;
-  
+
   function handleLock(isLocked, forceRedraw){
     //print("isLocked", Bangle.isLocked());
     for (let i of unlockedDrawInterval){
@@ -798,9 +799,6 @@ let firstDraw = true;
     }
   }
   
-  if (!global.WIDGETS) Bangle.loadWidgets();
-  clearWidgetsDraw();
-
   handleLock(Bangle.isLocked(), true);
 
   Bangle.setUI({ 
@@ -838,4 +836,7 @@ let firstDraw = true;
       restoreWidgetDraw();
     }
   });
+  
+  Bangle.loadWidgets();
+  clearWidgetsDraw();
 }