diff options
author | Christi Scarborough <christi@coraline.org> | 2005-11-18 15:33:05 +0000 |
---|---|---|
committer | Christi Scarborough <christi@coraline.org> | 2005-11-18 15:33:05 +0000 |
commit | 32a43e2ee688bf8b3c930685400a52910c512a1e (patch) | |
tree | 8675fddb2d926f0dabb65adb798033036a22c18d /apps/gui | |
parent | e16ebf1a50b9692e93f44633138903418ef93526 (diff) | |
download | rockbox-32a43e2ee688bf8b3c930685400a52910c512a1e.tar.gz rockbox-32a43e2ee688bf8b3c930685400a52910c512a1e.zip |
When fixing things is it better to do it in a way that causes them to actually work. Some more bugs in wpsbuild.pl squashed. Also, themes moved to the main menu. Resetting to default themes now works properly.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7965 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/gui')
-rw-r--r-- | apps/gui/gwps.c | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/apps/gui/gwps.c b/apps/gui/gwps.c index 2fff66e337..5877cf7c4b 100644 --- a/apps/gui/gwps.c +++ b/apps/gui/gwps.c | |||
@@ -731,11 +731,22 @@ bool wps_data_load(struct wps_data *wps_data, | |||
731 | * wants to be a virtual file. Feel free to modify dirbrowse() | 731 | * wants to be a virtual file. Feel free to modify dirbrowse() |
732 | * if you're feeling brave. | 732 | * if you're feeling brave. |
733 | */ | 733 | */ |
734 | if (! strcmp(buf, WPS_DEFAULTCFG) || !strcmp(buf, RWPS_DEFAULTCFG) ) | 734 | if (! strcmp(buf, WPS_DEFAULTCFG) ) |
735 | { | 735 | { |
736 | wps_reset(wps_data); | 736 | wps_reset(wps_data); |
737 | global_settings.wps_file[0] = 0; | ||
737 | return false; | 738 | return false; |
738 | } | 739 | } |
740 | |||
741 | #ifdef HAVE_REMOTE_LCD | ||
742 | if (! strcmp(buf, RWPS_DEFAULTCFG) ) | ||
743 | { | ||
744 | wps_reset(wps_data); | ||
745 | global_settings.rwps_file[0] = 0; | ||
746 | return false; | ||
747 | } | ||
748 | #endif | ||
749 | |||
739 | size_t bmpdirlen; | 750 | size_t bmpdirlen; |
740 | char *bmpdir = strrchr(buf, '.'); | 751 | char *bmpdir = strrchr(buf, '.'); |
741 | bmpdirlen = bmpdir - buf; | 752 | bmpdirlen = bmpdir - buf; |