Mercurial > repos > blastem
changeset 1984:0d5f88e53dca mame_interp
Fix merge error
author | Michael Pavone <pavone@retrodev.com> |
---|---|
date | Sun, 10 May 2020 00:16:00 -0700 |
parents | a7b753e260a2 |
children | 638eb2d25696 |
files | genesis.c |
diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/genesis.c Sat May 09 23:39:44 2020 -0700 +++ b/genesis.c Sun May 10 00:16:00 2020 -0700 @@ -476,7 +476,7 @@ #endif serialize_buffer state; init_serialize(&state); - genesis_serialize(gen, &state, address); + genesis_serialize(gen, &state, address, slot != EVENTLOG_SLOT); if (slot == SERIALIZE_SLOT) { gen->serialize_tmp = state.data; gen->serialize_size = state.size;