Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 15:09:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #9921 from jherico/menu_fix

Browse source 
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
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/ui/src/ui/Menu.cpp
View file

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