Skip to content

Commit 9896770

Browse files
cluckjscottleibrand
authored andcommitted
Don't crash if preferences are not defined... (#23)
* Update big_bg_status.js Don't crash if wearOLEDevenly is missing from preferences.json. * Update status.js Don't crash if wearOLEDevenly is missing from preferences.json * Update index.js Don't crash if status_screen is missing from preferences.json
1 parent c4d6fcc commit 9896770

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

index.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@ socketServer
5151
fs.readFile(openapsDir+'/preferences.json', function (err, data) {
5252
if (err) throw err;
5353
preferences = JSON.parse(data);
54-
if (preferences.status_screen == "bigbgstatus") {
54+
if (preferences.status_screen && preferences.status_screen == "bigbgstatus") {
5555
bigBGStatus(display, openapsDir);
56-
} else if (preferences.status_screen == "off") {
56+
} else if (preferences.status_screen && preferences.status_screen == "off") {
5757
//don't auto-update the screen if it's turned off
5858
} else {
5959
graphStatus(display, openapsDir); //default to graph status

scripts/big_bg_status.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -145,13 +145,13 @@ display.oled.update(); // write buffer to the screen
145145
fs.readFile(openapsDir+"/preferences.json", function (err, data) {
146146
if (err) throw err;
147147
preferences = JSON.parse(data);
148-
if (preferences.wearOLEDevenly.includes("off")) {
148+
if (preferences.wearOLEDevenly && preferences.wearOLEDevenly.includes("off")) {
149149
display.oled.invertDisplay(false);
150150
}
151-
else if (preferences.wearOLEDevenly.includes("nightandday") && (hour >= 20 || hour <= 8)) {
151+
else if (preferences.wearOLEDevenly && preferences.wearOLEDevenly.includes("nightandday") && (hour >= 20 || hour <= 8)) {
152152
display.oled.invertDisplay(false);
153153
}
154-
else if (preferences.wearOLEDevenly.includes("nightandday") && (hour <= 20 && hour >= 8)) {
154+
else if (preferences.wearOLEDevenly && preferences.wearOLEDevenly.includes("nightandday") && (hour <= 20 && hour >= 8)) {
155155
display.oled.invertDisplay(true);
156156
}
157157
else {

scripts/status.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -232,13 +232,13 @@ display.oled.update(); //write buffer to the screen
232232
fs.readFile(openapsDir+"/preferences.json", function (err, data) {
233233
if (err) throw err;
234234
preferences = JSON.parse(data);
235-
if (preferences.wearOLEDevenly.includes("off")) {
235+
if (preferences.wearOLEDevenly && preferences.wearOLEDevenly.includes("off")) {
236236
display.oled.invertDisplay(false);
237237
}
238-
else if (preferences.wearOLEDevenly.includes("nightandday") && (clockHour >= 20 || clockHour <= 8)) {
238+
else if (preferences.wearOLEDevenly && preferences.wearOLEDevenly.includes("nightandday") && (clockHour >= 20 || clockHour <= 8)) {
239239
display.oled.invertDisplay(false);
240240
}
241-
else if (preferences.wearOLEDevenly.includes("nightandday") && (clockHour <= 20 && clockHour >= 8)) {
241+
else if (preferences.wearOLEDevenly && preferences.wearOLEDevenly.includes("nightandday") && (clockHour <= 20 && clockHour >= 8)) {
242242
display.oled.invertDisplay(true);
243243
}
244244
else {

0 commit comments

Comments
 (0)