From 22706db54162051e49d48ef65e760fbb54147f0e Mon Sep 17 00:00:00 2001
From: Rob Pilling <robpilling@gmail.com>
Date: Wed, 15 Nov 2023 21:54:04 +0000
Subject: [PATCH 1/2] recorder: handle initial/non-settings load

---
 apps/recorder/ChangeLog     | 1 +
 apps/recorder/metadata.json | 2 +-
 apps/recorder/widget.js     | 2 ++
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/apps/recorder/ChangeLog b/apps/recorder/ChangeLog
index 5cb1c20b8..1a4e93660 100644
--- a/apps/recorder/ChangeLog
+++ b/apps/recorder/ChangeLog
@@ -41,3 +41,4 @@
 0.32: Add cadence data to output files
 0.33: Ensure that a new file is always created if the stuff that's being recorded has changed (fix #3081)
 0.34: Avoid prompting when creating a new file (#3081)
+0.35: Handle loading without a settings file (default record setting)
diff --git a/apps/recorder/metadata.json b/apps/recorder/metadata.json
index 71131ab20..cc912db6f 100644
--- a/apps/recorder/metadata.json
+++ b/apps/recorder/metadata.json
@@ -2,7 +2,7 @@
   "id": "recorder",
   "name": "Recorder",
   "shortName": "Recorder",
-  "version": "0.34",
+  "version": "0.35",
   "description": "Record GPS position, heart rate and more in the background, then download to your PC.",
   "icon": "app.png",
   "tags": "tool,outdoors,gps,widget,clkinfo",
diff --git a/apps/recorder/widget.js b/apps/recorder/widget.js
index 135797063..36c5d2a7e 100644
--- a/apps/recorder/widget.js
+++ b/apps/recorder/widget.js
@@ -9,6 +9,8 @@
     settings.period = settings.period||10;
     if (!settings.file || !settings.file.startsWith("recorder.log"))
       settings.recording = false;
+    if (!settings.record)
+      settings.record = ["gps"];
     return settings;
   }
 

From a4716c8718eba5efb64b8d12b630ddfd22c417ac Mon Sep 17 00:00:00 2001
From: Rob Pilling <robpilling@gmail.com>
Date: Wed, 15 Nov 2023 22:42:03 +0000
Subject: [PATCH 2/2] recorder: introduce `settings` in getActiveRecorders()

---
 apps/recorder/widget.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/recorder/widget.js b/apps/recorder/widget.js
index 36c5d2a7e..deaa96508 100644
--- a/apps/recorder/widget.js
+++ b/apps/recorder/widget.js
@@ -161,7 +161,7 @@
     return recorders;
   }
 
-  let getActiveRecorders = function() {
+  let getActiveRecorders = function(settings) {
     let activeRecorders = [];
     let recorders = getRecorders();
     settings.record.forEach(r => {
@@ -206,7 +206,7 @@
 
     if (settings.recording) {
       // set up recorders
-      activeRecorders = getActiveRecorders();
+      activeRecorders = getActiveRecorders(settings);
       activeRecorders.forEach(activeRecorder => {
         activeRecorder.start();
       });
@@ -255,7 +255,7 @@
       }
       var headers = require("Storage").open(settings.file,"r").readLine();
       if (headers){ // if file exists
-        if(headers.trim()!==getCSVHeaders(getActiveRecorders()).join(",")){
+        if(headers.trim()!==getCSVHeaders(getActiveRecorders(settings)).join(",")){
           // headers don't match, reset (#3081)
           options.force = "new";
         }