summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
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)
392 392
393 case TREE_ATTR_LNG: 393 case TREE_ATTR_LNG:
394 if(!lang_load(buf)) { 394 if(!lang_load(buf)) {
395 extern bool language_changed; /* from settings_menu.c */
396
397 set_file(buf, global_settings.lang_file, 395 set_file(buf, global_settings.lang_file,
398 MAX_FILENAME); 396 MAX_FILENAME);
399 talk_init(); /* use voice of same language */ 397 talk_init(); /* use voice of same language */
400 splash(HZ, true, str(LANG_LANGUAGE_LOADED)); 398 splash(HZ, true, str(LANG_LANGUAGE_LOADED));
401 language_changed = true;
402 } 399 }
403 break; 400 break;
404 401
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);
55#include "alarm_menu.h" 55#include "alarm_menu.h"
56#endif 56#endif
57 57
58/* This flag is set by dirbrowse() if a new language is loaded */
59bool language_changed;
60
61#ifdef HAVE_CHARGING 58#ifdef HAVE_CHARGING
62static bool car_adapter_mode(void) 59static bool car_adapter_mode(void)
63{ 60{
@@ -897,9 +894,7 @@ static bool custom_cfg_browse(void)
897 894
898static bool language_browse(void) 895static bool language_browse(void)
899{ 896{
900 language_changed = false; 897 return rockbox_browse(ROCKBOX_DIR LANG_DIR, SHOW_LNG);
901 rockbox_browse(ROCKBOX_DIR LANG_DIR, SHOW_LNG);
902 return language_changed;
903} 898}
904 899
905static bool voice_menus(void) 900static bool voice_menus(void)