summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorJens Arnold <amiconn@rockbox.org>2005-01-17 23:55:55 +0000
committerJens Arnold <amiconn@rockbox.org>2005-01-17 23:55:55 +0000
commit3badc7dda278f5521592276bceea83a6a2bab197 (patch)
tree247f736040fad59d1ed6470485033df98bc144f7 /apps
parent5e1ec2372c9624b22ad398dbfe5efdacd5cc9fbe (diff)
downloadrockbox-3badc7dda278f5521592276bceea83a6a2bab197.tar.gz
rockbox-3badc7dda278f5521592276bceea83a6a2bab197.tar.bz2
rockbox-3badc7dda278f5521592276bceea83a6a2bab197.zip
Leaving all menus when loading a new language is no longer necessary.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@5592 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r--apps/filetree.c3
-rw-r--r--apps/settings_menu.c7
2 files changed, 1 insertions, 9 deletions
diff --git a/apps/filetree.c b/apps/filetree.c
index 78ac9ff5ae..09c2a2dcc0 100644
--- a/apps/filetree.c
+++ b/apps/filetree.c
@@ -392,13 +392,10 @@ int ft_enter(struct tree_context* c)
case TREE_ATTR_LNG:
if(!lang_load(buf)) {
- extern bool language_changed; /* from settings_menu.c */
-
set_file(buf, global_settings.lang_file,
MAX_FILENAME);
talk_init(); /* use voice of same language */
splash(HZ, true, str(LANG_LANGUAGE_LOADED));
- language_changed = true;
}
break;
diff --git a/apps/settings_menu.c b/apps/settings_menu.c
index cf87564c9d..5d045be048 100644
--- a/apps/settings_menu.c
+++ b/apps/settings_menu.c
@@ -55,9 +55,6 @@ void dac_line_in(bool enable);
#include "alarm_menu.h"
#endif
-/* This flag is set by dirbrowse() if a new language is loaded */
-bool language_changed;
-
#ifdef HAVE_CHARGING
static bool car_adapter_mode(void)
{
@@ -897,9 +894,7 @@ static bool custom_cfg_browse(void)
static bool language_browse(void)
{
- language_changed = false;
- rockbox_browse(ROCKBOX_DIR LANG_DIR, SHOW_LNG);
- return language_changed;
+ return rockbox_browse(ROCKBOX_DIR LANG_DIR, SHOW_LNG);
}
static bool voice_menus(void)