diff options
| author | Jean-François Milants <jf@codingfield.com> | 2022-01-04 20:48:08 (GMT) |
|---|---|---|
| committer | Jean-François Milants <jf@codingfield.com> | 2022-01-04 20:48:08 (GMT) |
| commit | bef3e708f6b5a6f71797f72aab89d09520813046 (patch) | |
| tree | 8e955bb1b6c11c65afcc30eb39174ab20bfa0437 /src/displayapp/screens/settings/SettingWakeUp.h | |
| parent | b8b54f47a2a09e32186bf7d8dddc658fae2c6e5f (diff) | |
| parent | e82469bffac6383ab898fa71dc3a88e164dc86ff (diff) | |
Merge branch 'ShakeWake' of https://github.com/geekbozu/InfiniTime into geekbozu-ShakeWake
# Conflicts:
# src/CMakeLists.txt
# src/displayapp/Apps.h
# src/displayapp/DisplayApp.cpp
# src/displayapp/screens/settings/Settings.cpp
Diffstat (limited to 'src/displayapp/screens/settings/SettingWakeUp.h')
| -rw-r--r-- | src/displayapp/screens/settings/SettingWakeUp.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/displayapp/screens/settings/SettingWakeUp.h b/src/displayapp/screens/settings/SettingWakeUp.h index b9a31dc..cd244ae 100644 --- a/src/displayapp/screens/settings/SettingWakeUp.h +++ b/src/displayapp/screens/settings/SettingWakeUp.h @@ -20,7 +20,7 @@ namespace Pinetime { private: Controllers::Settings& settingsController; uint8_t optionsTotal; - lv_obj_t* cbOption[4]; + lv_obj_t* cbOption[5]; // When UpdateSelected is called, it uses lv_checkbox_set_checked, // which can cause extra events to be fired, // which might trigger UpdateSelected again, causing a loop. |