diff options
| author | Thomas Hartmann <Thomas.Hartmann@nokia.com> | 2011-09-12 10:21:53 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@nokia.com> | 2011-09-12 10:35:46 +0200 |
| commit | 421a1cf93c1ec5e6fae088a3bfc6547cb8481738 (patch) | |
| tree | eae64c67e971a0670c04f59aaa33d47ba77cd9d6 /src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.cpp | |
| parent | c00ee6701b0a1b1366c24e7ec8c907d4a623e3f5 (diff) | |
QmlDesigner.contextMenu: crash fix
Task-number: QTCREATORBUG-6071
Change-Id: Iae2cc199cd8ec3809bc635084b8a8fa79bb36b08
Reviewed-on: http://codereview.qt-project.org/4643
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Diffstat (limited to 'src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.cpp')
| -rw-r--r-- | src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.cpp b/src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.cpp index 0333b5e4fc..3ae4815cc2 100644 --- a/src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.cpp +++ b/src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.cpp @@ -71,7 +71,7 @@ static inline bool checkIfNodeIsAView(const ModelNode &node) static inline bool isItem(const ModelNode &node) { - return node.metaInfo().isValid() && node.metaInfo().isSubclassOf("QtQuick.Item", -1, -1); + return node.isValid() && node.metaInfo().isValid() && node.metaInfo().isSubclassOf("QtQuick.Item", -1, -1); } static inline QList<QmlItemNode> siblingsForNode(const QmlItemNode &itemNode) @@ -251,7 +251,7 @@ void ModelNodeContextMenu::execute(const QPoint &pos, bool selectionMenuBool) editMenu->addAction(action); action = createModelNodeAction(tr("Visibility"), editMenu, QList<ModelNode>() << currentSingleNode, ModelNodeAction::ModelNodeVisibility, singleSelected); editMenu->addAction(action); - if (!isItem(currentSingleNode)) + if (singleSelected && !isItem(currentSingleNode)) action->setDisabled(true); } else { |