From 2b95ba68af50c8c19247f3d72412402fd7e03c94 Mon Sep 17 00:00:00 2001
From: xxDUxx <96152564+xxDUxx@users.noreply.github.com>
Date: Sat, 3 Dec 2022 21:50:46 +0100
Subject: [PATCH] Update app.js

---
 apps/contourclock/app.js | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/apps/contourclock/app.js b/apps/contourclock/app.js
index 87eb3e5e8..8efa406c6 100644
--- a/apps/contourclock/app.js
+++ b/apps/contourclock/app.js
@@ -25,14 +25,21 @@
     var date = new Date();
     // Draw day of the week
     g.reset();
-    g.setFont("Teletext10x18Ascii");
-    g.clearRect(0,138,g.getWidth()-1,176);
-    if (settings.weekday) g.setFontAlign(0,1).drawString(require("locale").dow(date).toUpperCase(),g.getWidth()/2,g.getHeight()-18);
-    // Draw Date
-    if (settings.date) g.setFontAlign(0,1).drawString(require('locale').date(new Date(),1),g.getWidth()/2,g.getHeight());
+    if ((!settings.hideWhenLocked) || (!Bangle.isLocked())) {
+      // Draw day of the week
+      g.setFont("Teletext10x18Ascii");
+      g.clearRect(0,138,g.getWidth()-1,176);
+      if (settings.weekday) g.setFontAlign(0,1).drawString(require("locale").dow(date).toUpperCase(),g.getWidth()/2,g.getHeight()-18);
+      // Draw Date
+      if (settings.date) g.setFontAlign(0,1).drawString(require('locale').date(new Date(),1),g.getWidth()/2,g.getHeight());
+    }
     require('contourclock').drawClock(settings.fontIndex);
   };
   
+  require("FontTeletext10x18Ascii").add(Graphics);
+  g.clear();
+  
+  draw();
   if (settings.hideWhenLocked) Bangle.on('lock', function (locked) {
     if (!locked) require("widget_utils").show();
     else {
@@ -42,11 +49,6 @@
     }
     draw();
   });
-  
-  require("FontTeletext10x18Ascii").add(Graphics);
-  g.clear();
-  draw();
-  
   Bangle.setUI({mode:"clock", remove:function() {
     if (drawTimeout) clearTimeout(drawTimeout);
     if (settings.widgets && settings.hide) require("widget_utils").show();