From 2c1d44044469e0310fb8da36b45d521b5bbcc0dc Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Fri, 28 Mar 2008 19:56:25 +0000
Subject: [PATCH] From Paul Martz, "Some small changes and code cleanup.
 Biggest change is an improvement to the WriteResult return."

---
 src/osgPlugins/OpenFlight/ExportOptions.cpp        | 2 --
 src/osgPlugins/OpenFlight/FltWriteResult.h         | 2 +-
 src/osgPlugins/OpenFlight/ReaderWriterFLT.cpp      | 5 +++--
 src/osgPlugins/OpenFlight/VertexPaletteManager.cpp | 2 +-
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/osgPlugins/OpenFlight/ExportOptions.cpp b/src/osgPlugins/OpenFlight/ExportOptions.cpp
index 265120774..b138edba5 100644
--- a/src/osgPlugins/OpenFlight/ExportOptions.cpp
+++ b/src/osgPlugins/OpenFlight/ExportOptions.cpp
@@ -23,8 +23,6 @@
 #include <osgDB/ReadFile>
 
 #include "ExportOptions.h"
-//#include "DataOutputStream.h"
-//#include "FltNodeVisitor.h"
 
 #include <fstream>
 #include <sstream>
diff --git a/src/osgPlugins/OpenFlight/FltWriteResult.h b/src/osgPlugins/OpenFlight/FltWriteResult.h
index 545d33304..cfc618934 100644
--- a/src/osgPlugins/OpenFlight/FltWriteResult.h
+++ b/src/osgPlugins/OpenFlight/FltWriteResult.h
@@ -40,7 +40,7 @@ namespace flt
 class FltWriteResult : public osgDB::ReaderWriter::WriteResult
 {
 public:
-    FltWriteResult( WriteResult::WriteStatus status=WriteResult::FILE_NOT_HANDLED )
+    FltWriteResult( WriteResult::WriteStatus status=WriteResult::FILE_SAVED )
       : WriteResult( status )
         {}
 
diff --git a/src/osgPlugins/OpenFlight/ReaderWriterFLT.cpp b/src/osgPlugins/OpenFlight/ReaderWriterFLT.cpp
index a9512ccfc..96ce7efe7 100644
--- a/src/osgPlugins/OpenFlight/ReaderWriterFLT.cpp
+++ b/src/osgPlugins/OpenFlight/ReaderWriterFLT.cpp
@@ -451,11 +451,12 @@ class FLTReaderWriter : public ReaderWriter
             //   must use Node::accept() which requires 'node' to be non-const.
             //   Pretty much requires casting away const.
             osg::Node* nodeNonConst = const_cast<osg::Node*>( &node );
+            if (!nodeNonConst)
+                return WriteResult::ERROR_IN_WRITING_FILE;
             nodeNonConst->accept( fnv );
             fnv.complete( node );
 
-            // FIXME: Error-handling?
-            return WriteResult::FILE_SAVED;
+            return fltOpt->getWriteResult();
         }
 
     protected:
diff --git a/src/osgPlugins/OpenFlight/VertexPaletteManager.cpp b/src/osgPlugins/OpenFlight/VertexPaletteManager.cpp
index 17a55bc8f..bc151cfed 100644
--- a/src/osgPlugins/OpenFlight/VertexPaletteManager.cpp
+++ b/src/osgPlugins/OpenFlight/VertexPaletteManager.cpp
@@ -43,7 +43,7 @@ VertexPaletteManager::~VertexPaletteManager()
         if (_verticesStr.is_open())
         {
             osg::notify( osg::WARN ) << "fltexp: VertexPaletteManager destructor has an open temp file." << std::endl;
-            // This should not happen. FltNodeVisitor::complete should close
+            // This should not happen. FltExportVisitor::complete should close
             // this file before we get to this destructor.
             return;
         }