Don't make the SoundManager a memebr of the subsystem manager; It needs to be initial...

[flightgear.git] / src / Model / model_panel.cxx

diff --git a/src/Model/model_panel.cxx b/src/Model/model_panel.cxx
index ea24a2fa2e0c6fb0d503b0b83cf387388fc004ee..eef538cb0a41c7b809e7e3a2078afdf3066c3090 100644 (file)
--- a/src/Model/model_panel.cxx
+++ b/src/Model/model_panel.cxx
@@ -14,12 +14,12 @@
 #include <simgear/props/props.hxx>
 #include <simgear/scene/model/modellib.hxx>
 #include <simgear/scene/util/SGNodeMasks.hxx>
+#include <simgear/math/SGMath.hxx>
 
 #include "panelnode.hxx"
-
 #include "model_panel.hxx"
 
-SG_USING_STD(vector);
+using std::vector;
 
 using namespace simgear;
 
@@ -40,7 +40,8 @@ osg::Node *
 fgLoad3DModelPanel(const string &path, SGPropertyNode *prop_root)
 {
     osg::Node* node = SGModelLib::loadModel(path, prop_root, load_panel);
-    node->setNodeMask(~SG_NODEMASK_TERRAIN_BIT);
+    if (node)
+        node->setNodeMask(~SG_NODEMASK_TERRAIN_BIT);
     return node;
 }