From cdabf91b19934fcb26c1a666ad6b1e3b02c828a4 Mon Sep 17 00:00:00 2001 From: etabeta78 Date: Tue, 2 Jun 2015 15:06:46 +0200 Subject: [PATCH] added some further sanity check. nw. --- src/emu/bus/a7800/a78_slot.c | 2 +- src/emu/bus/gameboy/gb_slot.c | 2 +- src/emu/bus/megadrive/md_slot.c | 2 +- src/emu/bus/sega8/sega8_slot.c | 2 +- src/emu/bus/vboy/slot.c | 2 +- src/emu/bus/wswan/slot.c | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/emu/bus/a7800/a78_slot.c b/src/emu/bus/a7800/a78_slot.c index e7f6da4f6cb..6332492a6c2 100644 --- a/src/emu/bus/a7800/a78_slot.c +++ b/src/emu/bus/a7800/a78_slot.c @@ -488,7 +488,7 @@ void a78_partialhash(hash_collection &dest, const unsigned char *data, void a78_cart_slot_device::call_unload() { - if (m_cart && m_cart->get_nvram_size()) + if (m_cart && m_cart->get_nvram_base() && m_cart->get_nvram_size()) battery_save(m_cart->get_nvram_base(), 0x800); } diff --git a/src/emu/bus/gameboy/gb_slot.c b/src/emu/bus/gameboy/gb_slot.c index 60c98447591..922dc91cce2 100644 --- a/src/emu/bus/gameboy/gb_slot.c +++ b/src/emu/bus/gameboy/gb_slot.c @@ -438,7 +438,7 @@ bool megaduck_cart_slot_device::call_load() void base_gb_cart_slot_device::call_unload() { - if (m_cart && m_cart->get_ram_size() && m_cart->get_has_battery()) + if (m_cart && m_cart->get_ram_base() && m_cart->get_ram_size() && m_cart->get_has_battery()) battery_save(m_cart->get_ram_base(), m_cart->get_ram_size()); } diff --git a/src/emu/bus/megadrive/md_slot.c b/src/emu/bus/megadrive/md_slot.c index b53419b5528..af40c089d5a 100644 --- a/src/emu/bus/megadrive/md_slot.c +++ b/src/emu/bus/megadrive/md_slot.c @@ -552,7 +552,7 @@ int base_md_cart_slot_device::load_nonlist() void base_md_cart_slot_device::call_unload() { - if (m_cart && m_cart->get_nvram_size()) + if (m_cart && m_cart->get_nvram_base() && m_cart->get_nvram_size()) battery_save(m_cart->get_nvram_base(), m_cart->get_nvram_size()); } diff --git a/src/emu/bus/sega8/sega8_slot.c b/src/emu/bus/sega8/sega8_slot.c index 0aa73d2c6c2..92c80af2c61 100644 --- a/src/emu/bus/sega8/sega8_slot.c +++ b/src/emu/bus/sega8/sega8_slot.c @@ -410,7 +410,7 @@ bool sega8_cart_slot_device::call_load() void sega8_cart_slot_device::call_unload() { - if (m_cart && m_cart->get_ram_size() && m_cart->get_has_battery()) + if (m_cart && m_cart->get_ram_base() && m_cart->get_ram_size() && m_cart->get_has_battery()) battery_save(m_cart->get_ram_base(), m_cart->get_ram_size()); } diff --git a/src/emu/bus/vboy/slot.c b/src/emu/bus/vboy/slot.c index 0cbbb618419..da00aeaca04 100644 --- a/src/emu/bus/vboy/slot.c +++ b/src/emu/bus/vboy/slot.c @@ -213,7 +213,7 @@ bool vboy_cart_slot_device::call_load() void vboy_cart_slot_device::call_unload() { - if (m_cart && m_cart->get_eeprom_size()) + if (m_cart && m_cart->get_eeprom_base() && m_cart->get_eeprom_size()) battery_save(m_cart->get_eeprom_base(), m_cart->get_eeprom_size() * 4); } diff --git a/src/emu/bus/wswan/slot.c b/src/emu/bus/wswan/slot.c index 6e22ab1b40b..8da5f6e694d 100644 --- a/src/emu/bus/wswan/slot.c +++ b/src/emu/bus/wswan/slot.c @@ -232,7 +232,7 @@ bool ws_cart_slot_device::call_load() void ws_cart_slot_device::call_unload() { - if (m_cart && m_cart->get_nvram_size()) + if (m_cart && m_cart->get_nvram_base() && m_cart->get_nvram_size()) battery_save(m_cart->get_nvram_base(), m_cart->get_nvram_size()); }