From 9df78bdf2ec2676653c4eaa8a9114e517e5016d5 Mon Sep 17 00:00:00 2001 From: Frode Solheim Date: Thu, 30 Jan 2014 00:48:52 +0100 Subject: [PATCH] fixed in logic bug in a logging statement (missing parentheses) --- custom.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/custom.cpp b/custom.cpp index 1790b395..ffe097f0 100644 --- a/custom.cpp +++ b/custom.cpp @@ -7732,7 +7732,7 @@ void custom_reset (bool hardreset, bool keyboardreset) write_log (_T("CPU=%d Chipset=%s %s\n"), currprefs.cpu_model, (currprefs.chipset_mask & CSMASK_AGA) ? _T("AGA") : - (currprefs.chipset_mask & CSMASK_ECS_AGNUS | CSMASK_ECS_DENISE) == (CSMASK_ECS_AGNUS | CSMASK_ECS_DENISE) ? _T("Full ECS") : + (currprefs.chipset_mask & (CSMASK_ECS_AGNUS | CSMASK_ECS_DENISE)) == (CSMASK_ECS_AGNUS | CSMASK_ECS_DENISE) ? _T("Full ECS") : (currprefs.chipset_mask & CSMASK_ECS_DENISE) ? _T("ECS Denise") : (currprefs.chipset_mask & CSMASK_ECS_AGNUS) ? _T("ECS") : _T("OCS"), currprefs.ntscmode ? _T("NTSC") : _T("PAL")); -- 2.47.3