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

This commit is contained in:
Arif Ali 2011-10-29 01:30:07 +01:00
commit b4812b5b34
2 changed files with 2 additions and 2 deletions

View File

@ -795,7 +795,7 @@ void show_nandroid_menu()
};
if (volume_for_path("/emmc") == NULL)
INSTALL_MENU_ITEMS[3] = NULL;
list[3] = NULL;
int chosen_item = get_menu_selection(headers, list, 0, 0);
switch (chosen_item)

View File

@ -758,7 +758,7 @@ print_property(const char *key, const char *name, void *cookie) {
int
main(int argc, char **argv) {
if (strstr(argv[0], "recovery") == NULL)
if (strcmp(basename(argv[0]), "recovery") != 0)
{
if (strstr(argv[0], "flash_image") != NULL)
return flash_image_main(argc, argv);