From 7b9809e5670f3628b7cb8c0b5429e4bd8072e42f Mon Sep 17 00:00:00 2001 From: Tim Edwards Date: Sat, 25 Mar 2023 15:06:25 -0400 Subject: [PATCH] Fixed the "flatten" command so that "-dotoplabels" works as advertised, and doesn't crash magic. --- commands/CmdFI.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/commands/CmdFI.c b/commands/CmdFI.c index fb624e71..2a5b1cb5 100644 --- a/commands/CmdFI.c +++ b/commands/CmdFI.c @@ -2123,15 +2123,16 @@ CmdFlatten(w, cmd) DBCellCopyAllPaint(&scx, &DBAllButSpaceAndDRCBits, xMask, flatDestUse); DBFlatCopyMaskHints(&scx, xMask, flatDestUse); - if (dolabels) - FlatCopyAllLabels(&scx, &DBAllTypeBits, xMask, flatDestUse); - else if (toplabels) + if (toplabels) { int savemask = scx.scx_use->cu_expandMask; scx.scx_use->cu_expandMask = CU_DESCEND_SPECIAL; - DBCellCopyAllLabels(&scx, &DBAllTypeBits, CU_DESCEND_SPECIAL, flatDestUse); + DBCellCopyAllLabels(&scx, &DBAllTypeBits, CU_DESCEND_SPECIAL, flatDestUse, + NULL); scx.scx_use->cu_expandMask = savemask; } + else if (dolabels) + FlatCopyAllLabels(&scx, &DBAllTypeBits, xMask, flatDestUse); if (xMask != CU_DESCEND_ALL) DBCellCopyAllCells(&scx, xMask, flatDestUse, (Rect *)NULL);