rename user `preferences.xml' to `autosave.xml'. The former name lead to

problems because a lot of people already have their *real* preferences
set in ~/.fgfs/preferences.xml (and don't want fgfs to stomp over them),
because the name doesn't tell people that their data aren't save there
(comments!), and because this is inconsistent with the global preferences.xml
file, where user changes *are* respected.

diff --git a/src/Main/fg_commands.cxx b/src/Main/fg_commands.cxx
index 23bf24222647224d619ece1e8a562d389c32ee18..8af168e7ad1344b056aab37fc432a7dade26834c 100644 (file)
--- a/src/Main/fg_commands.cxx
+++ b/src/Main/fg_commands.cxx
@@ -205,16 +205,16 @@ do_exit (const SGPropertyNode * arg)
             SGPath config( homedir );
             config.append( ".fgfs" );
 #endif
-            config.append( "preferences.xml" );
+            config.append( "autosave.xml" );
             config.create_dir( 0700 );
-            SG_LOG(SG_IO, SG_INFO, "Saving user preferences");
+            SG_LOG(SG_IO, SG_INFO, "Saving user settings to autosave.xml");
             try {
                 writeProperties(config.str(), globals->get_props(), false, SGPropertyNode::USERARCHIVE);
             } catch (const sg_exception &e) {
-                guiErrorMessage("Error saving preferences: ", e);
+                guiErrorMessage("Error writing autosave.xml: ", e);
             }
 
-            SG_LOG(SG_INPUT, SG_BULK, "Finished Saving user preferences");
+            SG_LOG(SG_INPUT, SG_BULK, "Finished Saving user settings");
         }
     }
     fgExit(arg->getIntValue("status", 0));

diff --git a/src/Main/fg_init.cxx b/src/Main/fg_init.cxx
index d59cf4216e7d5db5cf50be49603c5eaa9dc786a1..9cda8aba1a8340c99cabed70123c2c5fc3b060ed 100644 (file)
--- a/src/Main/fg_init.cxx
+++ b/src/Main/fg_init.cxx
@@ -606,15 +606,15 @@ bool fgInitConfig ( int argc, char **argv ) {
         SGPath config( homedir );
         config.append( ".fgfs" );
 #endif
-        config.append( "preferences.xml" );
-        SG_LOG(SG_INPUT, SG_INFO, "Reading user preferences");
+        config.append( "autosave.xml" );
+        SG_LOG(SG_INPUT, SG_INFO, "Reading user settings from autosave.xml");
         try {
             fgLoadProps(config.str().c_str(), globals->get_props(), false,
                         SGPropertyNode::USERARCHIVE);
         } catch (...) {
-            SG_LOG(SG_INPUT, SG_BULK, "First time reading user preferences.");
+            SG_LOG(SG_INPUT, SG_BULK, "First time reading user settings");
         }
-        SG_LOG(SG_INPUT, SG_BULK, "Finished Reading user preferences");
+        SG_LOG(SG_INPUT, SG_BULK, "Finished Reading user settings");
     }
 
     // parse options after loading aircraft to ensure any user