From ce25d51763e1d6d9ba10074c25fefd44723b1694 Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Fri, 7 Feb 2020 01:41:03 +0100 Subject: [PATCH] WIP: refactoring ongoing. --- src/laybasic/laybasic/layAbstractMenu.cc | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/laybasic/laybasic/layAbstractMenu.cc b/src/laybasic/laybasic/layAbstractMenu.cc index 5c63d1d24..33b5c9e54 100644 --- a/src/laybasic/laybasic/layAbstractMenu.cc +++ b/src/laybasic/laybasic/layAbstractMenu.cc @@ -1013,7 +1013,7 @@ AbstractMenu::create_action (const std::string &s, lay::Dispatcher *dispatcher) parse_menu_title (s, title, shortcut, res, tool_tip); - ActionHandle *ah = new ActionHandle (dispatcher->menu_parent_widget ()); + ActionHandle *ah = new ActionHandle (dispatcher ? dispatcher->menu_parent_widget () : 0); ah->ptr ()->setText (tl::to_qstring (title)); if (! tool_tip.empty ()) { @@ -1613,7 +1613,11 @@ AbstractMenu::find_item (tl::Extractor &extr) std::string n; extr.read (n, ".+>("); - if (n == "begin") { + if (n.empty ()) { + + // skip (avoids infinite loops on wrong paths) + + } else if (n == "begin") { iter = parent->children.begin ();