From 31c6115d73097f95fff701e9535b4140663e407e Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Mon, 31 Mar 2008 16:23:52 +0000
Subject: [PATCH] Added checks for a valid scene graph before doing various ops
 on it.

---
 src/osgViewer/Viewer.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/osgViewer/Viewer.cpp b/src/osgViewer/Viewer.cpp
index 8a26c76cf..e10b2e9e9 100644
--- a/src/osgViewer/Viewer.cpp
+++ b/src/osgViewer/Viewer.cpp
@@ -313,7 +313,7 @@ void Viewer::setSceneData(osg::Node* node)
 
     View::setSceneData(node);
 
-    if (_threadingModel!=SingleThreaded)
+    if (_threadingModel!=SingleThreaded && getSceneData())
     {
         // make sure that existing scene graph objects are allocated with thread safe ref/unref
         getSceneData()->setThreadSafeRefUnref(true);
@@ -776,7 +776,7 @@ void Viewer::eventTraversal()
         
     }
 
-    if (_eventVisitor.valid() && _scene.valid())
+    if (_eventVisitor.valid() && getSceneData())
     {
         _eventVisitor->setFrameStamp(getFrameStamp());
         _eventVisitor->setTraversalNumber(getFrameStamp()->getFrameNumber());