From e9af824fe06d885bfc83e77bd00e97ebfe44d0cc Mon Sep 17 00:00:00 2001 From: Nikita Baryshnikov Date: Thu, 11 Jun 2015 18:48:34 +0300 Subject: [PATCH] QmlDesigner: avoid uninitialized warning Change-Id: I88d3da3030b5a2b71b3d807ba9482e2e0e656b37 Reviewed-by: Tim Jenssen --- .../components/formeditor/formeditorview.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/plugins/qmldesigner/components/formeditor/formeditorview.cpp b/src/plugins/qmldesigner/components/formeditor/formeditorview.cpp index 1074618d32b..919d65d5c8b 100644 --- a/src/plugins/qmldesigner/components/formeditor/formeditorview.cpp +++ b/src/plugins/qmldesigner/components/formeditor/formeditorview.cpp @@ -409,7 +409,7 @@ void FormEditorView::changeToCustomTool() { if (hasSelectedModelNodes()) { int handlingRank = 0; - AbstractCustomTool *selectedCustomTool; + AbstractCustomTool *selectedCustomTool = 0; ModelNode selectedModelNode = selectedModelNodes().first(); @@ -424,9 +424,11 @@ void FormEditorView::changeToCustomTool() if (handlingRank > 0) { m_scene->updateAllFormEditorItems(); m_currentTool->clear(); - m_currentTool = selectedCustomTool; - m_currentTool->clear(); - m_currentTool->setItems(scene()->itemsForQmlItemNodes(toQmlItemNodeList(selectedModelNodes()))); + if (selectedCustomTool) { + m_currentTool = selectedCustomTool; + m_currentTool->clear(); + m_currentTool->setItems(scene()->itemsForQmlItemNodes(toQmlItemNodeList(selectedModelNodes()))); + } } } }