From d41f4ec842c905d84f01b75ccc2494b9630a3114 Mon Sep 17 00:00:00 2001
From: Jeff Young <jeff@rokeby.ie>
Date: Fri, 10 Nov 2023 13:57:23 +0000
Subject: [PATCH] Only disable unflashed layers when they're conditionally
 flashed.

Fixes https://gitlab.com/kicad/code/kicad/-/issues/16061
---
 pcbnew/pcb_painter.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pcbnew/pcb_painter.cpp b/pcbnew/pcb_painter.cpp
index 598ad19d84..29f5341a3e 100644
--- a/pcbnew/pcb_painter.cpp
+++ b/pcbnew/pcb_painter.cpp
@@ -345,7 +345,7 @@ COLOR4D PCB_RENDER_SETTINGS::GetColor( const VIEW_ITEM* aItem, int aLayer ) cons
         {
             const PAD* pad = static_cast<const PAD*>( item );
 
-            if( !pad->FlashLayer( primary ) )
+            if( pad->IsOnLayer( primary ) && !pad->FlashLayer( primary ) )
             {
                 isActive = false;