From 762aa66d6280cc81d803e027403765206e49c5e2 Mon Sep 17 00:00:00 2001
From: Seth Hillbrand <seth@kipro-pcb.com>
Date: Thu, 7 Aug 2025 05:18:11 -0700
Subject: [PATCH] Try again to fix template assert

Fixes https://gitlab.com/kicad/code/kicad/-/issues/21438
---
 kicad/dialogs/dialog_template_selector.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/kicad/dialogs/dialog_template_selector.cpp b/kicad/dialogs/dialog_template_selector.cpp
index decefb4cee..8bb1ee25be 100644
--- a/kicad/dialogs/dialog_template_selector.cpp
+++ b/kicad/dialogs/dialog_template_selector.cpp
@@ -417,6 +417,9 @@ void DIALOG_TEMPLATE_SELECTOR::replaceCurrentPage()
     wxString title = m_notebook->GetPageText( page );
     wxString currPath = m_tcTemplatePath->GetValue();
 
+    // Block all events to the notebook and its children
+    wxEventBlocker blocker( m_notebook );
+
     // Detach webview from current panel before deleting it
     if( (unsigned)page < m_panels.size() )
     {
@@ -439,7 +442,6 @@ void DIALOG_TEMPLATE_SELECTOR::replaceCurrentPage()
     buildPageContent( m_tcTemplatePath->GetValue(), page );
 
     m_selectedWidget = nullptr;
-
     // Reset to welcome page after rebuilding
     m_webviewPanel->SetPage( GetWelcomeHtml() );