Clean up constructor a bit.

diff --git a/simgear/timing/sg_time.cxx b/simgear/timing/sg_time.cxx
index 3aa89d92e4d30c1d54cdeadb01912f61dce0b1a9..0013d3b0e837c7ef3584b107466ef2b5d495d9e7 100644 (file)
--- a/simgear/timing/sg_time.cxx
+++ b/simgear/timing/sg_time.cxx
@@ -75,18 +75,23 @@ SGTime::SGTime( double lon, double lat, const string& root )
     // cout << "Current local time          = " 
     //      << asctime(localtime(&cur_time)) << endl;
 
-    FGPath zone( root );
-    zone.append( "zone.tab" );
-    FG_LOG( FG_EVENT, FG_DEBUG, "Reading timezone info from: " << zone.str() );
-    tzContainer = new TimezoneContainer( zone.c_str() );
-
-    GeoCoord location( RAD_TO_DEG * lat, RAD_TO_DEG * lon );
-    GeoCoord* nearestTz = tzContainer->getNearest(location);
-
-    FGPath name( root );
-    name.append( nearestTz->getDescription() );
-    zonename = strdup( name.c_str() );
-    // cout << "Using zonename = " << zonename << endl;
+    if ( root != "" ) {
+       FGPath zone( root );
+       zone.append( "zone.tab" );
+       FG_LOG( FG_EVENT, FG_DEBUG, "Reading timezone info from: "
+               << zone.str() );
+       tzContainer = new TimezoneContainer( zone.c_str() );
+
+       GeoCoord location( RAD_TO_DEG * lat, RAD_TO_DEG * lon );
+       GeoCoord* nearestTz = tzContainer->getNearest(location);
+
+       FGPath name( root );
+       name.append( nearestTz->getDescription() );
+       zonename = strdup( name.c_str() );
+       // cout << "Using zonename = " << zonename << endl;
+    } else {
+       tzContainer = NULL;
+    }
 }
 
 
@@ -95,9 +100,16 @@ SGTime::SGTime( const string& root ) {
 }
 
 
+SGTime::SGTime() {
+    SGTime( 0.0, 0.0, "" );
+}
+
+
 SGTime::~SGTime()
 {
-    delete tzContainer;
+    if ( tzContainer != NULL ) {
+       delete tzContainer;
+    }
 
     if ( zonename != NULL ) {
        delete zonename;

diff --git a/simgear/timing/sg_time.hxx b/simgear/timing/sg_time.hxx
index 9c143b18de3936b76351a46feb54969b9127d5c7..0c0f04083057761aa0037a8da13ba1d17f4245eb 100644 (file)
--- a/simgear/timing/sg_time.hxx
+++ b/simgear/timing/sg_time.hxx
@@ -86,6 +86,7 @@ public:
 
     SGTime( double lon, double lat, const string& root );
     SGTime( const string& root );
+    SGTime();
     ~SGTime();
 
     // Update the time related variables