From 9563658c4ea48c889335d5099fa75d8070bcaf83 Mon Sep 17 00:00:00 2001
From: gsuarezc <72304747+gsuarezc@users.noreply.github.com>
Date: Sat, 30 Nov 2024 17:43:52 +0000
Subject: [PATCH] owmweather: Fix infinite loop when settings.updated is not
 defined

---
 apps/owmweather/ChangeLog     |  3 ++-
 apps/owmweather/boot.js       | 12 ++++++------
 apps/owmweather/metadata.json |  2 +-
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/apps/owmweather/ChangeLog b/apps/owmweather/ChangeLog
index 020e5770b2..a2251f83b1 100644
--- a/apps/owmweather/ChangeLog
+++ b/apps/owmweather/ChangeLog
@@ -5,4 +5,5 @@
 0.05: Upgrade OWM to One Call API 3.0. Add pressure to weather.json
 0.06: Fix One Call API 3.0 not returning city names, which are required by the weather app
 0.07: Update weather after reconnecting bluetooth if update is due, refactor code
-0.08: Undo change to One Call API 3.0
\ No newline at end of file
+0.08: Undo change to One Call API 3.0
+0.09: Fix infinite loop when settings.updated is not defined
\ No newline at end of file
diff --git a/apps/owmweather/boot.js b/apps/owmweather/boot.js
index f2a2116edb..dc206be38d 100644
--- a/apps/owmweather/boot.js
+++ b/apps/owmweather/boot.js
@@ -7,8 +7,8 @@
   );
 
   let refreshMillis = function () {
-    return settings.refresh * 1000 * 60 + 1  // +1 <- leave some slack
-  }
+    return settings.refresh * 1000 * 60 + 1;  // +1 <- leave some slack
+  };
 
   let onCompleted = function () {
     loading = false;
@@ -16,7 +16,7 @@
     require('Storage').writeJSON("owmweather.json", settings);
     if (timeoutRef) clearTimeout(timeoutRef);
     timeoutRef = setTimeout(loadIfDueAndReschedule, refreshMillis());
-  }
+  };
 
   let loadIfDueAndReschedule = function () {
     // also check if the weather.json file has been updated (e.g. force refresh)
@@ -27,18 +27,18 @@
     }
 
     let MillisUntilDue = settings.updated + refreshMillis() - Date.now();
-    if (MillisUntilDue <= 0) {
+    if (!MillisUntilDue || MillisUntilDue <= 0) {
       if (!loading) {
         loading = true;
         require("owmweather").pull(onCompleted);
       }
     } else {
       // called to early, reschedule
-      // console.log('Weather data is not due yet, rescheduling in ' + MillisUntilDue|0 + 'ms');
+      // console.log('Weather data is not due yet, rescheduling in ' + (MillisUntilDue || 0) + 'ms');
       if (timeoutRef) clearTimeout(timeoutRef);
       timeoutRef = setTimeout(loadIfDueAndReschedule, MillisUntilDue + 1);
     }
-  }
+  };
 
   if (settings.enabled) {
     setTimeout(loadIfDueAndReschedule, 5000);  // run 5 seconds after boot
diff --git a/apps/owmweather/metadata.json b/apps/owmweather/metadata.json
index 796df8c1cb..8dfa4fe9c6 100644
--- a/apps/owmweather/metadata.json
+++ b/apps/owmweather/metadata.json
@@ -1,7 +1,7 @@
 { "id": "owmweather",
   "name": "OpenWeatherMap weather provider",
   "shortName":"OWM Weather",
-  "version": "0.08",
+  "version": "0.09",
   "description": "Pulls weather from OpenWeatherMap (OWM) API",
   "icon": "app.png",
   "type": "bootloader",