From 1985f5663c5c37f3b92dcaf200fec7b8aa7786e2 Mon Sep 17 00:00:00 2001
From: Matthias Koefferlein <matthias@klayout.de>
Date: Sat, 7 Mar 2026 13:28:35 +0100
Subject: [PATCH] Fixing issue #2293

---
 src/layui/layui/layLayerControlPanel.cc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/layui/layui/layLayerControlPanel.cc b/src/layui/layui/layLayerControlPanel.cc
index dab52fa44..b7a2ba70c 100644
--- a/src/layui/layui/layLayerControlPanel.cc
+++ b/src/layui/layui/layLayerControlPanel.cc
@@ -1951,7 +1951,9 @@ LayerControlPanel::do_update_content ()
     mp_layer_list->doItemsLayout ();
 
     //  establishes the current layer in case it was changed during the "in update" phase
-    mp_layer_list->set_current (lay::LayerPropertiesConstIterator (mp_view->get_properties (), m_current_layer));
+    if (m_current_layer != 0) {
+      mp_layer_list->set_current (lay::LayerPropertiesConstIterator (mp_view->get_properties (), m_current_layer));
+    }
 
     m_needs_update = false;