From 56882a7413678d3da5fc88b0bafa41571a34495a Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Tue, 3 May 2005 21:53:25 +0000
Subject: [PATCH] From Alberto Farre, "Missed a FilepathList pop_back line from
 my last submission.

I have also commented out the option string set with FLT_VER because it
overwrites other option string and I found it redundant and not needed."
---
 src/osgPlugins/flt/FltFile.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/osgPlugins/flt/FltFile.cpp b/src/osgPlugins/flt/FltFile.cpp
index a318a77db..1564ca5c7 100644
--- a/src/osgPlugins/flt/FltFile.cpp
+++ b/src/osgPlugins/flt/FltFile.cpp
@@ -261,9 +261,9 @@ bool FltFile::readFile(const std::string& fileName)
                             pushAndPopPath = (fpl.empty() | fpl.back().empty() ? "." : fpl.back()) + "/" + filePath;
                         }
 
-                        char optionsString[256];
+                        /*char optionsString[256];
                         sprintf(optionsString,"FLT_VER %d",rec.getFlightVersion());
-                        options->setOptionString(optionsString);
+                        options->setOptionString(optionsString);*/
 
                         //osg::notify(osg::NOTICE)<<"Create local path"<<pushAndPopPath<<std::endl;
 
@@ -279,6 +279,8 @@ bool FltFile::readFile(const std::string& fileName)
                         }
 
                         pExternalFltFile->readModel(filename);
+
+                        fpl.pop_back();
                     }
 
                     rec.setExternal(pExternalFltFile);