allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Activity

robustify Canvas DEBUG_TRACE for PBD::CanvasEvents to handle case where an event handler deletes the item

Browse Source
This commit is contained in:
Paul Davis
2025-01-31 12:33:43 -07:00
parent debef6ab25
commit 7cf89d192b
1 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
libs/canvas/canvas.cc
View File

@@ -909,19 +909,23 @@ GtkCanvas::deliver_event (GdkEvent* event)
Item* parent = item->parent ();
if (!item->ignore_events () &&
item->Event (event)) {
/* this item has just handled the event */
DEBUG_TRACE (
PBD::DEBUG::CanvasEvents,
string_compose ("canvas event handled by %1 %2\n", item->whatami(), item->name.empty() ? "[unknown]" : item->name)
);
#ifndef NDEBUG
/* the item may have be deleted as part of the
* handler, we cannot use it in DEBUG_TRACE() calls.
*/
std::string w = item->whatami();
std::string n = item->name;
#endif
if (!item->ignore_events () && item->Event (event)) {
#ifndef NDEBUG
DEBUG_TRACE (PBD::DEBUG::CanvasEvents, string_compose ("canvas event handled by %1 %2\n", w, n.empty() ? "[unknown]" : n));
#endif
return true;
}
DEBUG_TRACE (PBD::DEBUG::CanvasEvents, string_compose ("canvas event %3 left unhandled by %1 %2\n", item->whatami(), item->name.empty() ? "[unknown]" : item->name, event_type_string (event->type)));
#ifndef NDEBUG
DEBUG_TRACE (PBD::DEBUG::CanvasEvents, string_compose ("canvas event %3 left unhandled by %1 %2\n", w, n.empty() ? "[unknown]" : n, event_type_string (event->type)));
#endif
if ((item = parent) == 0) {
break;
}