Merge pull request #2283 from abdelq/crash-on-reload

klayoutmatthias · web-flow · commit b1e49f6032a8 · 2026-04-06T14:34:33.000+02:00
Avoid crashing when clicking reload
diff --git a/src/lay/lay/layMacroEditorPage.cc b/src/lay/lay/layMacroEditorPage.cc
@@ -124,10 +124,14 @@ MacroEditorNotificationWidget::MacroEditorNotificationWidget (MacroEditorPage *p
 void
 MacroEditorNotificationWidget::action_triggered ()
 {
+  BEGIN_PROTECTED
+
   auto a = m_action_buttons.find (sender ());
   if (a != m_action_buttons.end ()) {
     mp_parent->notification_action (*mp_notification, a->second);
   }
+
+  END_PROTECTED_W (this)
 }
 
 void
diff --git a/src/layview/layview/layLayoutView_qt.cc b/src/layview/layview/layLayoutView_qt.cc
@@ -139,10 +139,14 @@ LayoutViewNotificationWidget::LayoutViewNotificationWidget (LayoutViewWidget *pa
 void
 LayoutViewNotificationWidget::action_triggered ()
 {
+  BEGIN_PROTECTED
+
   auto a = m_action_buttons.find (sender ());
   if (a != m_action_buttons.end ()) {
     mp_parent->notification_action (*mp_notification, a->second);
   }
+
+  END_PROTECTED_W (this)
 }
 
 void

Original file line number	Diff line number	Diff line change
`@@ -124,10 +124,14 @@ MacroEditorNotificationWidget::MacroEditorNotificationWidget (MacroEditorPage *p`
`124`	`124`	`void`
`125`	`125`	`MacroEditorNotificationWidget::action_triggered ()`
`126`	`126`	`{`
	`127`	`+ BEGIN_PROTECTED`
	`128`	`+`
`127`	`129`	`auto a = m_action_buttons.find (sender ());`
`128`	`130`	`if (a != m_action_buttons.end ()) {`
`129`	`131`	`mp_parent->notification_action (*mp_notification, a->second);`
`130`	`132`	`}`
	`133`	`+`
	`134`	`+ END_PROTECTED_W (this)`
`131`	`135`	`}`
`132`	`136`
`133`	`137`	`void`
Original file line number	Diff line number	Diff line change
`@@ -139,10 +139,14 @@ LayoutViewNotificationWidget::LayoutViewNotificationWidget (LayoutViewWidget *pa`
`139`	`139`	`void`
`140`	`140`	`LayoutViewNotificationWidget::action_triggered ()`
`141`	`141`	`{`
	`142`	`+ BEGIN_PROTECTED`
	`143`	`+`
`142`	`144`	`auto a = m_action_buttons.find (sender ());`
`143`	`145`	`if (a != m_action_buttons.end ()) {`
`144`	`146`	`mp_parent->notification_action (*mp_notification, a->second);`
`145`	`147`	`}`
	`148`	`+`
	`149`	`+ END_PROTECTED_W (this)`
`146`	`150`	`}`
`147`	`151`
`148`	`152`	`void`