luke
/
klayout
mirror of https://github.com/KLayout/klayout.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed merge commit.

This commit is contained in:
Matthias Koefferlein 2020-11-14 20:51:39 +01:00
parent ad0cad83c8
commit 13c3353148
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/laybasic/laybasic/layAbstractMenu.cc
View File

@ -1070,7 +1070,7 @@ AbstractMenu::build (QMenuBar *mbar, QToolBar *tbar)
prev_action = a->second;
present_actions.erase (*a);
} else {
prev_action = insert_action_after (mbar, prev_action, c->action ().qaction ());
prev_action = insert_action_after (mbar, prev_action, c->action ()->qaction ());
}
}
@ -1136,7 +1136,7 @@ AbstractMenu::build (QMenu *m, std::list<AbstractMenuItem> &items)
prev_action = a->second;
present_actions.erase (*a);
} else {
prev_action = insert_action_after (m, prev_action, c->action ().qaction ());
prev_action = insert_action_after (m, prev_action, c->action ()->qaction ());
}
}