Ron Jensen: fixed a potential NaN and Segfault in JSBSim propeller code

[flightgear.git] / src / Environment / ephemeris.cxx

diff --git a/src/Environment/ephemeris.cxx b/src/Environment/ephemeris.cxx
index a6a1f5c9476d9d0c09e9576cd5fd8d826d2da08e..21ff38b4d308335ae89d29cfadd40a0ad93099ad 100644 (file)
--- a/src/Environment/ephemeris.cxx
+++ b/src/Environment/ephemeris.cxx
@@ -1,3 +1,25 @@
+// ephemeris.cxx -- wrap SGEphemeris code in a subsystem
+//
+// Written by James Turner, started June 2010.
+//
+// Copyright (C) 2010  Curtis L. Olson  - http://www.flightgear.org/~curt
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License as
+// published by the Free Software Foundation; either version 2 of the
+// License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful, but
+// WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+//
+// $Id$
+
 #include <Environment/ephemeris.hxx>
 
 #include <simgear/timing/sg_time.hxx>
@@ -10,6 +32,10 @@ Ephemeris::Ephemeris() :
   _impl(NULL),
   _latProp(NULL)
 {
+    SGPath ephem_data_path(globals->get_fg_root());
+    ephem_data_path.append("Astro");
+    _impl = new SGEphemeris(ephem_data_path.c_str());
+    globals->set_ephem(_impl);
 }
 
 Ephemeris::~Ephemeris()
@@ -19,19 +45,13 @@ Ephemeris::~Ephemeris()
 
 void Ephemeris::init()
 {
-  if (_impl) {
-    return;
-  }
-  
-  SGPath ephem_data_path(globals->get_fg_root());
-  ephem_data_path.append("Astro");
-  _impl = new SGEphemeris(ephem_data_path.c_str());
-  globals->set_ephem(_impl);
+  _latProp = fgGetNode("/position/latitude-deg", true);
+  update(0.0);
 }
 
 void Ephemeris::postinit()
 {
-  update(0.0);
+  
 }
 
 static void tieStar(const char* prop, Star* s, double (Star::*getter)() const)
@@ -41,8 +61,6 @@ static void tieStar(const char* prop, Star* s, double (Star::*getter)() const)
 
 void Ephemeris::bind()
 {
-  _latProp = fgGetNode("/position/latitude-deg", true);
-  
   tieStar("/ephemeris/sun/xs", _impl->get_sun(), &Star::getxs);
   tieStar("/ephemeris/sun/ys", _impl->get_sun(), &Star::getys);
   tieStar("/ephemeris/sun/ze", _impl->get_sun(), &Star::getze);