3 files changed, 29 insertions, 15 deletions

diff --git a/apps/menus/display_menu.c b/apps/menus/display_menu.c
index 3e1443d02e..948dcede00 100644
--- a/apps/menus/display_menu.c
+++ b/apps/menus/display_menu.c
@@ -43,6 +43,7 @@
 #endif
 #include "viewport.h"
 #include "statusbar.h" /* statusbar_vals enum*/
+#include "rbunicode.h"
 
 #ifdef HAVE_BACKLIGHT
 static int filterfirstkeypress_callback(int action,const struct menu_item_ex *this_item)
@@ -524,8 +525,25 @@ MAKE_MENU(touchscreen_menu, ID2P(LANG_TOUCHSCREEN_SETTINGS), NULL, Icon_NOICON,
             &touchscreen_menu_calibrate, &touchscreen_menu_reset_calibration);
 #endif
 
+static int codepage_callback(int action, const struct menu_item_ex *this_item)
+{
+    static int old_codepage;
+    int new_codepage = global_settings.default_codepage;
+    (void)this_item;
+    switch (action)
+    {
+        case ACTION_ENTER_MENUITEM:
+            old_codepage = new_codepage;
+            break;
+        case ACTION_EXIT_MENUITEM:
+            if (new_codepage != old_codepage)
+                set_codepage(new_codepage);
+            break;
+    }
+    return action;
+}
 
-MENUITEM_SETTING(codepage_setting, &global_settings.default_codepage, NULL);
+MENUITEM_SETTING(codepage_setting, &global_settings.default_codepage, codepage_callback);
 
 
 MAKE_MENU(display_menu, ID2P(LANG_DISPLAY),
diff --git a/apps/menus/main_menu.c b/apps/menus/main_menu.c
index 6a1295996c..8764101f73 100644
--- a/apps/menus/main_menu.c
+++ b/apps/menus/main_menu.c
@@ -48,6 +48,7 @@
 #include "time.h"
 #include "wps.h"
 #include "skin_buffer.h"
+#include "disk.h"
 
 static const struct browse_folder_info config = {ROCKBOX_DIR, SHOW_CFG};
 
@@ -160,14 +161,14 @@ static const char* info_getname(int selected_item, void *data,
 #endif
     if (info->new_data)
     {
-        fat_size(IF_MV(0,) &info->size, &info->free);
+        volume_size(IF_MV(0,) &info->size, &info->free);
 #ifdef HAVE_MULTIVOLUME
 #ifndef APPLICATION
-        if (fat_ismounted(1))
-            fat_size(1, &info->size2, &info->free2);
-        else
+        volume_size(1, &info->size2, &info->free2);
+#else
+        info->size2 = 0;
 #endif
-            info->size2 = 0;
+
 #endif
         info->new_data = false;
     }
@@ -347,12 +348,7 @@ static int info_action_callback(int action, struct gui_synclist *lists)
         info->new_data = true;
         splash(0, ID2P(LANG_SCANNING_DISK));
         for (i = 0; i < NUM_VOLUMES; i++)
-        {
-#ifdef HAVE_HOTSWAP
-            if (fat_ismounted(i))
-#endif
-                fat_recalc_free(IF_MV(i));
-        }
+            volume_recalc_free(IF_MV(i));
 #else
         (void) lists;
 #endif
diff --git a/apps/menus/settings_menu.c b/apps/menus/settings_menu.c
index 95423a20fa..0d2a7febf1 100644
--- a/apps/menus/settings_menu.c
+++ b/apps/menus/settings_menu.c
@@ -209,12 +209,12 @@ static int dircache_callback(int action,const struct menu_item_ex *this_item)
     switch (action)
     {
         case ACTION_EXIT_MENUITEM: /* on exit */
-            if (global_settings.dircache && !dircache_is_enabled())
+            if (global_settings.dircache)
             {
-                if (dircache_build(0) < 0)
+                if (dircache_enable() < 0)
                     splash(HZ*2, ID2P(LANG_PLEASE_REBOOT));
             }
-            else if (!global_settings.dircache && dircache_is_enabled())
+            else
             {
                 dircache_disable();
             }