Merge branch 'nullptr_hotfix' into 'master'

null pointer check for getObject in datacontrol and selection plugin



See merge request !43

Plugin-Datacontrol/DataControlPlugin.cc

@@ -390,14 +390,15 @@ void DataControlPlugin::fileOpened(int _id){
 
   BaseObject* obj = 0;
 
-  if ( PluginFunctions::getObject(_id, obj) )
+  if ( PluginFunctions::getObject(_id, obj) ) {
     model_->objectAdded(obj);
 
-  // Only if the added object was a light source, we will traverse the objects!
-  if ( obj->dataType() == DATA_LIGHT)
-    slotShowLightSources(tool_->lightSources->checkState());
+    // Only if the added object was a light source, we will traverse the objects!
+    if ( obj->dataType() == DATA_LIGHT)
+      slotShowLightSources(tool_->lightSources->checkState());
 
-  view_->resizeColumnToContents(0);
+    view_->resizeColumnToContents(0);
+  }
 }
 
 

PluginCollection-Selection/Plugin-SelectionBase/SelectionBasePlugin.cc

@@ -1547,7 +1547,7 @@ void SelectionBasePlugin::addedEmptyObject (int _id) {
       PluginFunctions::getObject(_id, bObject);
 
       // Groups are ok, others will cause an error
-      if (!bObject->isGroup()) {
+      if (bObject && !bObject->isGroup()) {
         emit log(LOGERR, "Could not retrieve object type! Maybe a selection environment will be missing.");
       }