From 98078cdd552ab343b758a1c3615e6f02b514bb53 Mon Sep 17 00:00:00 2001
From: James Turner <zakalawe@mac.com>
Date: Sat, 16 Nov 2013 12:00:00 +0000
Subject: [PATCH] Reset: make fgSetDefaults non-static.

---
 src/Main/fg_init.cxx | 1 +
 src/Main/options.cxx | 5 +----
 src/Main/options.hxx | 2 ++
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Main/fg_init.cxx b/src/Main/fg_init.cxx
index 8905a6a1d..d1d4d15ca 100644
--- a/src/Main/fg_init.cxx
+++ b/src/Main/fg_init.cxx
@@ -490,6 +490,7 @@ int fgInitConfig ( int argc, char **argv )
     home->setStringValue(dataPath.c_str());
     home->setAttribute(SGPropertyNode::WRITE, false);
   
+    fgSetDefaults();
     flightgear::Options* options = flightgear::Options::sharedInstance();
     options->init(argc, argv, dataPath);
     bool loadDefaults = flightgear::Options::sharedInstance()->shouldLoadDefaultConfig();
diff --git a/src/Main/options.cxx b/src/Main/options.cxx
index eecb6e668..6a5b8bbbe 100644
--- a/src/Main/options.cxx
+++ b/src/Main/options.cxx
@@ -114,8 +114,7 @@ static int fgSetupProxy( const char *arg );
  * in case, we provide some initial sane values here. This method
  * should be invoked *before* reading any init files.
  */
-static void
-fgSetDefaults ()
+void fgSetDefaults ()
 {
 
 				// Position (deliberately out of range)
@@ -1704,8 +1703,6 @@ Options::~Options()
   
 void Options::init(int argc, char **argv, const SGPath& appDataPath)
 {
-  fgSetDefaults();
-  
 // first, process the command line
   bool inOptions = true;
   for (int i=1; i<argc; ++i) {
diff --git a/src/Main/options.hxx b/src/Main/options.hxx
index 7765ecffe..d0715cda2 100644
--- a/src/Main/options.hxx
+++ b/src/Main/options.hxx
@@ -130,4 +130,6 @@ private:
   
 } // of namespace flightgear
 
+void fgSetDefaults();
+
 #endif /* _OPTIONS_HXX */
-- 
2.39.5