summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
authorJens Arnold <amiconn@rockbox.org>2004-11-19 01:13:33 +0000
committerJens Arnold <amiconn@rockbox.org>2004-11-19 01:13:33 +0000
commit359ef77e323d35c8f37950cfea82f2cd3ec573e6 (patch)
treee9da5cd0f3b0d760b21adfec5ae78aca3925ac5f /apps
parentbb4872ecce14d621605bdb7c7d71fcafdb9177a6 (diff)
downloadrockbox-359ef77e323d35c8f37950cfea82f2cd3ec573e6.tar.gz
rockbox-359ef77e323d35c8f37950cfea82f2cd3ec573e6.zip
Bug fix: Unit for the 'Peak Release' setting was not displayed, and calling that setting caused a NULL pointer access
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@5435 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r--apps/settings_menu.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/apps/settings_menu.c b/apps/settings_menu.c
index ab4f242816..c61352b1cc 100644
--- a/apps/settings_menu.c
+++ b/apps/settings_menu.c
@@ -262,9 +262,10 @@ static bool peak_meter_release(void) {
262 fits into a 7 bit number. The 8th bit is used for storing 262 fits into a 7 bit number. The 8th bit is used for storing
263 something else in the rtc ram. 263 something else in the rtc ram.
264 Also, the max value is 0x7e, since the RTC value 0xff is reserved */ 264 Also, the max value is 0x7e, since the RTC value 0xff is reserved */
265 retval = set_int( str(LANG_PM_RELEASE), STR(LANG_PM_UNITS_PER_READ), 265 retval = set_int( str(LANG_PM_RELEASE), str(LANG_PM_UNITS_PER_READ),
266 &global_settings.peak_meter_release, 266 LANG_PM_UNITS_PER_READ,
267 NULL, 1, 1, 0x7e); 267 &global_settings.peak_meter_release,
268 NULL, 1, 1, 0x7e);
268 269
269 peak_meter_init_times(global_settings.peak_meter_release, 270 peak_meter_init_times(global_settings.peak_meter_release,
270 global_settings.peak_meter_hold, 271 global_settings.peak_meter_hold,