diff options
| author | Jonathan Gordon <rockbox@jdgordon.info> | 2007-02-07 06:14:35 +0000 |
|---|---|---|
| committer | Jonathan Gordon <rockbox@jdgordon.info> | 2007-02-07 06:14:35 +0000 |
| commit | 48289a51adb6ac7c28670fbd3e87a12ff9251e9c (patch) | |
| tree | 69a39ebf5147257b756914b7785c902ed4c2e72a /apps | |
| parent | 946e4f871bc405a03f142d9329f2aceee81d1010 (diff) | |
| download | rockbox-48289a51adb6ac7c28670fbd3e87a12ff9251e9c.tar.gz rockbox-48289a51adb6ac7c28670fbd3e87a12ff9251e9c.zip | |
Do Mike's previous patch a bit nicer.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12224 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/settings.c | 3 | ||||
| -rw-r--r-- | apps/settings.h | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/apps/settings.c b/apps/settings.c index de27c9812c..f4966e952e 100644 --- a/apps/settings.c +++ b/apps/settings.c @@ -76,9 +76,10 @@ struct user_settings global_settings; /* Initial values for globally needed state data that shouldn't be saved or reset should be defined here and not in settings_list */ + struct system_status global_status = { - .__dummy = 0, + .runtime = 0, /* this will be overwritten when nvram settings are loaded */ #ifdef CONFIG_TUNER .in_radio_screen = false, .radio_status = FMRADIO_OFF, diff --git a/apps/settings.h b/apps/settings.h index 1e1798db80..379084b885 100644 --- a/apps/settings.h +++ b/apps/settings.h @@ -250,9 +250,6 @@ void settings_apply_trigger(void); struct system_status { - int __dummy; /* dummy member needed until at least one statically - initialized member is guaranteed to be in - global_status */ int resume_index; /* index in playlist (-1 for no active resume) */ int resume_first_index; /* index of first track in playlist */ uint32_t resume_offset; /* byte offset in mp3 file */ |