diff options
| author | William Wilgus <wilgus.william@gmail.com> | 2024-12-26 08:56:14 -0500 |
|---|---|---|
| committer | William Wilgus <wilgus.william@gmail.com> | 2024-12-26 08:56:14 -0500 |
| commit | 0c4b78c01123c5731e78fecb80e915e38b8c5135 (patch) | |
| tree | 67e1cd2d972ca3c247932379ae0ef96a31ad2ae6 | |
| parent | fa8b095f292f369168741e94d7c394bc5358fec3 (diff) | |
| download | rockbox-0c4b78c011.tar.gz rockbox-0c4b78c011.zip | |
[Bugfix] RTC_TOKEN_PRESENT is less than SKIN_TOKENS_RTC_BEGIN
this blocks the check for RTC_TOKEN_PRESENT
thanks, chris_s
Change-Id: I53a7d83d7cd8e5e9b9d6ea6eed016dc35571bcd3
| -rw-r--r-- | apps/gui/skin_engine/skin_tokens.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/apps/gui/skin_engine/skin_tokens.c b/apps/gui/skin_engine/skin_tokens.c index 21ad8e8b89..a54da2c238 100644 --- a/apps/gui/skin_engine/skin_tokens.c +++ b/apps/gui/skin_engine/skin_tokens.c @@ -775,8 +775,7 @@ static const char* get_rtc_token_value(struct wps_token *token, default: return "?"; - case SKIN_TOKEN_RTC_PRESENT: - return "c"; + case SKIN_TOKEN_RTC_12HOUR_CFG: snprintf(buf, buf_size, "%d", global_settings.timeformat); numeric_ret = global_settings.timeformat + 1; @@ -894,8 +893,7 @@ static const char* get_rtc_token_value(struct wps_token *token, { default: return "?"; - case SKIN_TOKEN_RTC_PRESENT: - return NULL; + case SKIN_TOKEN_RTC_DAY_OF_MONTH: case SKIN_TOKEN_RTC_DAY_OF_MONTH_BLANK_PADDED: case SKIN_TOKEN_RTC_HOUR_24_ZERO_PADDED: @@ -1350,6 +1348,12 @@ const char *get_token_value(struct gui_wps *gwps, numeric_buf = buf; goto gtv_ret_numeric_tag_info; + case SKIN_TOKEN_RTC_PRESENT: +#if CONFIG_RTC + return "c"; +#else + return NULL; +#endif /* peakmeter */ case SKIN_TOKEN_PEAKMETER_LEFT: case SKIN_TOKEN_PEAKMETER_RIGHT: |