From 1f6195f2d5fe34fecf80b3f4278bdd70e9e32e7a Mon Sep 17 00:00:00 2001
From: thyttan <6uuxstm66@mozmail.com⁩>
Date: Mon, 7 Oct 2024 20:43:04 +0200
Subject: [PATCH] alarm: fix uncaught error if no scroller (Bangle 1)

---
 apps/alarm/ChangeLog     | 2 ++
 apps/alarm/app.js        | 4 ++--
 apps/alarm/metadata.json | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/apps/alarm/ChangeLog b/apps/alarm/ChangeLog
index a3a5dfc1c5..d7b8edc55c 100644
--- a/apps/alarm/ChangeLog
+++ b/apps/alarm/ChangeLog
@@ -51,3 +51,5 @@
 0.46: Show alarm groups if the Show Group setting is ON.  Scroll alarms menu back to previous position when getting back to it.
 0.47: Fix wrap around when snoozed through midnight
 0.48: Use datetimeinput for Events, if available. Scroll back when getting out of group.  Menu date format setting for shorter dates on current year.
+0.49: fix uncaught error if no scroller (Bangle 1). Would happen when trying
+	to select an alarm in the main menu.
diff --git a/apps/alarm/app.js b/apps/alarm/app.js
index 0535051876..bec147f96f 100644
--- a/apps/alarm/app.js
+++ b/apps/alarm/app.js
@@ -94,7 +94,7 @@ function showMainMenu(scroll, group, scrollback) {
     if(showAlarm) {
       menu[trimLabel(getLabel(e),40)] = {
         value: e.on ? (e.timer ? iconTimerOn : iconAlarmOn) : (e.timer ? iconTimerOff : iconAlarmOff),
-        onchange: () => setTimeout(e.timer ? showEditTimerMenu : showEditAlarmMenu, 10, e, index, undefined, scroller.scroll, group)
+        onchange: () => setTimeout(e.timer ? showEditTimerMenu : showEditAlarmMenu, 10, e, index, undefined, scroller?scroller.scroll:undefined, group)
       };
     } else if (getGroups) {
       groups[e.group] = undefined;
@@ -102,7 +102,7 @@ function showMainMenu(scroll, group, scrollback) {
   });
 
   if (!group) {
-    Object.keys(groups).sort().forEach(g => menu[g] = () => showMainMenu(null, g, scroller.scroll));
+    Object.keys(groups).sort().forEach(g => menu[g] = () => showMainMenu(null, g, scroller?scroller.scroll:undefined));
     menu[/*LANG*/"Advanced"] = () => showAdvancedMenu();
   }
 
diff --git a/apps/alarm/metadata.json b/apps/alarm/metadata.json
index 78cd4bd4ec..a8e22658c6 100644
--- a/apps/alarm/metadata.json
+++ b/apps/alarm/metadata.json
@@ -2,7 +2,7 @@
   "id": "alarm",
   "name": "Alarms & Timers",
   "shortName": "Alarms",
-  "version": "0.48",
+  "version": "0.49",
   "description": "Set alarms and timers on your Bangle",
   "icon": "app.png",
   "tags": "tool,alarm",