switch (dev->type) {
case DEVICE_TYPE_OPTICAL:
case DEVICE_TYPE_DISK:
+ case DEVICE_TYPE_USB:
/* Find block info */
for (i = 0; sys && i < sys->n_blockdevs; i++) {
bd = sys->blockdevs[i];
}
if (matched) {
snprintf(buf,sizeof(buf),"[%s: %s / %s]",
- dev->type == DEVICE_TYPE_DISK ?
- _("Disk") : _("CD/DVD"),
+ device_type_display_name(dev->type),
bd->name, bd->uuid);
}
break;
{
unsigned int i;
- for (i = 0; i < item->pmenu->item_count; i++)
- if (item->pmenu->items[i] == item->nci)
- return i;
+ if (item)
+ for (i = 0; i < item->pmenu->item_count; i++)
+ if (item->pmenu->items[i] == item->nci)
+ return i;
pb_log("%s: not found: %p %s\n", __func__, item,
(item ? item->nci->name.str : "(null)"));