X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FFDM%2FJSBSim%2Fmodels%2FFGOutput.cpp;h=3131cd6c0d7506bd0d2a9288becb32d8b9a3ce8f;hb=fac1525fde5f30d10c5431c5b02f85abd7589e63;hp=ab70cb2d2de6098afa0957099c56824fc0e6ef49;hpb=05a2eff317bebe1072f8d4d5c3b23796622e22e1;p=flightgear.git diff --git a/src/FDM/JSBSim/models/FGOutput.cpp b/src/FDM/JSBSim/models/FGOutput.cpp index ab70cb2d2..3131cd6c0 100644 --- a/src/FDM/JSBSim/models/FGOutput.cpp +++ b/src/FDM/JSBSim/models/FGOutput.cpp @@ -74,7 +74,7 @@ using namespace std; namespace JSBSim { -static const char *IdSrc = "$Id: FGOutput.cpp,v 1.54 2011/03/11 13:02:26 jberndt Exp $"; +static const char *IdSrc = "$Id: FGOutput.cpp,v 1.55 2011/05/20 03:18:36 jberndt Exp $"; static const char *IdHdr = ID_OUTPUT; // (stolen from FGFS native_fdm.cxx) @@ -157,8 +157,6 @@ FGOutput::~FGOutput() bool FGOutput::InitModel(void) { - if (!FGModel::InitModel()) return false; - if (Filename.size() > 0 && StartNewFile) { ostringstream buf; string::size_type dot = BaseFilename.find_last_of('.'); @@ -178,11 +176,11 @@ bool FGOutput::InitModel(void) //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -bool FGOutput::Run(void) +bool FGOutput::Run(bool Holding) { - if (FGModel::Run()) return true; + if (FGModel::Run(Holding)) return true; - if (enabled && !FDMExec->IntegrationSuspended() && !FDMExec->Holding()) { + if (enabled && !FDMExec->IntegrationSuspended() && !Holding) { RunPreFunctions(); Print(); RunPostFunctions();