Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-27 10:43:07 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

optimised device removal & prevent accessing removed devices

Browse Source
This commit is contained in:
smf- 2011-05-07 09:41:21 +00:00
parent 4b896b641d
commit 3b01fd9a76
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/emu/mconfig.c
View File

@ -140,12 +140,14 @@ void machine_config::device_remove_subdevices(const device_t *device)
device_t *sub_device = m_devicelist.first(); device_t *sub_device = m_devicelist.first();
while (sub_device != NULL) while (sub_device != NULL)
{ {
device_t *next_device = sub_device->next();
if (sub_device->owner() == device) if (sub_device->owner() == device)
{
device_remove_subdevices(sub_device); device_remove_subdevices(sub_device);
m_devicelist.remove(sub_device->tag());
} device_t *next_device = sub_device->next();
if (sub_device->owner() == device)
m_devicelist.remove(*sub_device);
sub_device = next_device; sub_device = next_device;
} }
} }
@ -192,8 +194,9 @@ device_t *machine_config::device_remove(device_t *owner, const char *tag)
{ {
astring tempstring; astring tempstring;
const char *fulltag = owner->subtag(tempstring, tag); const char *fulltag = owner->subtag(tempstring, tag);
device_remove_subdevices(m_devicelist.find(fulltag)); device_t *device=m_devicelist.find(fulltag);
m_devicelist.remove(fulltag); device_remove_subdevices(device);
m_devicelist.remove(*device);
return NULL; return NULL;
} }