Detect the hostname as early as possible to prevent a segmentation fault (and an...

diff --git a/src/Main/fg_init.cxx b/src/Main/fg_init.cxx
index 5ad9476021430d06c3222f18f74720a1bb372b36..0c57030a10bbaa341c7f943b4eddecf4596adea0 100644 (file)
--- a/src/Main/fg_init.cxx
+++ b/src/Main/fg_init.cxx
@@ -145,6 +145,15 @@ float init_volume;
 static string fgScanForOption( const string& option, int argc, char **argv ) {
     int i = 1;
 
+    cout << "The quest for hostname part 1" << endl;
+    if (hostname == NULL)
+    {
+        char _hostname[256];
+        gethostname(_hostname, 256);
+        hostname = strdup(_hostname);
+        free_hostname = true;
+    }
+
     SG_LOG(SG_GENERAL, SG_INFO, "Scanning command line for: " << option );
 
     int len = option.length();
@@ -212,14 +221,6 @@ static string fgScanForOption( const string& option, const string& path ) {
 static string fgScanForOption( const string& option ) {
     string arg("");
 
-    if (hostname == NULL)
-    {
-        char _hostname[256];
-        gethostname(_hostname, 256);
-        hostname = strdup(_hostname);
-        free_hostname = true;
-    }
-
 #if defined( unix ) || defined( __CYGWIN__ )
     // Next check home directory for .fgfsrc.hostname file
     if ( arg.empty() ) {