From f997eb6ca4177b577387306b4c15ec4815f0f13c Mon Sep 17 00:00:00 2001 From: Patric Stout Date: Tue, 8 Jun 2021 20:30:44 +0200 Subject: Fix: compatible NewGRFs in crash-log reported wrong md5 (#9340) The text suggests it reports the original md5, but it does in fact report the replaced md5. Now it reports both. --- src/saveload/afterload.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/saveload/afterload.cpp b/src/saveload/afterload.cpp index f60c12b91..ff2159996 100644 --- a/src/saveload/afterload.cpp +++ b/src/saveload/afterload.cpp @@ -402,9 +402,11 @@ static void CDECL HandleSavegameLoadCrash(int signum) for (const GRFConfig *c = _grfconfig; c != nullptr; c = c->next) { if (HasBit(c->flags, GCF_COMPATIBLE)) { const GRFIdentifier *replaced = GetOverriddenIdentifier(c); - char buf[40]; - md5sumToString(buf, lastof(buf), replaced->md5sum); - p += seprintf(p, lastof(buffer), "NewGRF %08X (checksum %s) not found.\n Loaded NewGRF \"%s\" with same GRF ID instead.\n", BSWAP32(c->ident.grfid), buf, c->filename); + char original_md5[40]; + char replaced_md5[40]; + md5sumToString(original_md5, lastof(original_md5), c->original_md5sum); + md5sumToString(replaced_md5, lastof(replaced_md5), replaced->md5sum); + p += seprintf(p, lastof(buffer), "NewGRF %08X (checksum %s) not found.\n Loaded NewGRF \"%s\" (checksum %s) with same GRF ID instead.\n", BSWAP32(c->ident.grfid), original_md5, c->filename, replaced_md5); } if (c->status == GCS_NOT_FOUND) { char buf[40]; -- cgit v1.2.3-54-g00ecf