Merge pull request #9921 from jherico/menu_fix

Fix possible crash in Menu::removeSeparator
This commit is contained in:
Andrew Meadows 2017-03-20 13:38:36 -07:00 committed by GitHub
commit 92e3f8768c

View file

@ -470,8 +470,8 @@ void Menu::removeSeparator(const QString& menuName, const QString& separatorName
if (menu) {
int textAt = findPositionOfMenuItem(menu, separatorName);
QList<QAction*> menuActions = menu->actions();
QAction* separatorText = menuActions[textAt];
if (textAt > 0 && textAt < menuActions.size()) {
QAction* separatorText = menuActions[textAt];
QAction* separatorLine = menuActions[textAt - 1];
if (separatorLine) {
if (separatorLine->isSeparator()) {