Changeset 4654 for geovis

Timestamp:

Oct 17, 2014 8:26:28 PM (10 years ago)

Author:

ldelgass

Message:

Crash fix for commands sent before map is set up

File:

• geovis/trunk/Renderer.cpp (modified) (4 diffs)

geovis/trunk/Renderer.cpp

@@ -1331 +1331 @@
 void Renderer::updateBoxSelection(int x, int y)
 {
-    osgEarth::Annotation::FeatureNode *node = _selectionBox.get();
     double nlat, nlong;
     if (!mouseToLatLong(x, y, &nlat, &nlong)) {
@@ -1362 +1361 @@
         latMax = _anchorLat;
     }
+    osgEarth::Annotation::FeatureNode *node = _selectionBox.get();
     osgEarth::Symbology::Geometry *geom = node->getFeature()->getGeometry();
     (*geom)[0] = osg::Vec3d(longMax, latMin, 0);
@@ -1466 +1466 @@
 void Renderer::hoverPlaceNode(int x, int y, bool invertY)
 {
+    if (!_placeNodes.valid()) {
+        ERROR("No place nodes");
+        return;
+    }
     osgEarth::Picker picker(_viewer.get(), _placeNodes.get());
     osgEarth::Picker::Hits hits;
@@ -1507 +1511 @@
 void Renderer::deletePlaceNode(int x, int y, bool invertY)
 {
+    if (!_placeNodes.valid()) {
+        ERROR("No place nodes");
+        return;
+    }
     osgEarth::Picker picker(_viewer.get(), _placeNodes.get());
     osgEarth::Picker::Hits hits;