Merge branch 'gingerbread' of git://github.com/CyanogenMod/android_bootable_recovery into gingerbread

This commit is contained in:
Arif Ali 2011-10-30 02:30:05 +00:00
commit c971f76e45

View File

@ -708,8 +708,8 @@ void show_partition_menu()
void show_nandroid_advanced_restore_menu(const char* path)
{
if (ensure_path_mounted("/sdcard") != 0) {
LOGE ("Can't mount /sdcard\n");
if (ensure_path_mounted(path) != 0) {
LOGE ("Can't mount sdcard\n");
return;
}
@ -722,7 +722,9 @@ void show_nandroid_advanced_restore_menu(const char* path)
NULL
};
char* file = choose_file_menu("/sdcard/clockworkmod/backup/", NULL, advancedheaders);
char tmp[PATH_MAX];
sprintf(tmp, "%s/clockworkmod/backup", path);
char* file = choose_file_menu(tmp, NULL, advancedheaders);
if (file == NULL)
return;
@ -740,7 +742,6 @@ void show_nandroid_advanced_restore_menu(const char* path)
NULL
};
char tmp[PATH_MAX];
if (0 != get_partition_device("wimax", tmp)) {
// disable wimax restore option
list[5] = NULL;