Merge branch 'master' into RB-2.1

MrKepzie · Jul 4, 2016 · a35480a · a35480a
2 parents 35ded73 + e33b748
commit a35480a
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/Gui/GuiAppInstance.cpp b/Gui/GuiAppInstance.cpp
@@ -1076,7 +1076,8 @@ void
 GuiAppInstance::onGroupCreationFinished(const NodePtr& node,
                                         const boost::shared_ptr<NodeSerialization>& serialization, bool autoConnect)
 {
-    if (autoConnect && !serialization) {
+    boost::shared_ptr<NodeGuiI> node_gui_i = node->getNodeGui();
+    if (autoConnect && !serialization && node_gui_i) {
         NodeGraph* graph = 0;
         boost::shared_ptr<NodeCollection> collection = node->getGroup();
         assert(collection);
@@ -1100,12 +1101,10 @@ GuiAppInstance::onGroupCreationFinished(const NodePtr& node,
                 selectedNode.reset();
             }
         }
-        boost::shared_ptr<NodeGuiI> node_gui_i = node->getNodeGui();
-        assert(node_gui_i);
         NodeGuiPtr nodeGui = boost::dynamic_pointer_cast<NodeGui>(node_gui_i);
         graph->moveNodesForIdealPosition(nodeGui, selectedNode, true);
     }
-
+ 
     AppInstance::onGroupCreationFinished(node, serialization, autoConnect);
 
     /*std::list<ViewerInstance* > viewers;