diff --git a/src/emu/ui/viewgfx.c b/src/emu/ui/viewgfx.c index 2a0bf782457..075fdf7a238 100644 --- a/src/emu/ui/viewgfx.c +++ b/src/emu/ui/viewgfx.c @@ -909,7 +909,7 @@ static void gfxset_draw_item(running_machine &machine, gfx_element *gfx, int ind }; int width = (rotate & ORIENTATION_SWAP_XY) ? gfx->height() : gfx->width(); int height = (rotate & ORIENTATION_SWAP_XY) ? gfx->width() : gfx->height(); - const rgb_t *palette = (machine.first_screen()->palette()->entries() != 0) ? machine.first_screen()->palette()->palette()->entry_list_raw() : NULL; + const rgb_t *palette = (machine.first_screen()->palette() != NULL) ? machine.first_screen()->palette()->palette()->entry_list_raw() : NULL; UINT32 palette_mask = ~0; int x, y; diff --git a/src/mame/machine/megacd.c b/src/mame/machine/megacd.c index 0a146504340..8b327737509 100644 --- a/src/mame/machine/megacd.c +++ b/src/mame/machine/megacd.c @@ -1732,7 +1732,7 @@ READ16_MEMBER( sega_segacd_device::segacd_font_converted_r ) void sega_segacd_device::device_start() { - if (m_gfxdecode != NULL && !m_gfxdecode->started()) + if (!m_gfxdecode->started()) throw device_missing_dependencies(); segacd_gfx_conversion_timer = machine().device(":segacd:stamp_timer");