Fixed an error at shutdown (gSavedSettings.cleanup).

2 files changed, 10 insertions, 1 deletions

diff --git a/ChangeLog.txt b/ChangeLog.txt
index c665dbf..a6dbd4d 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,10 @@
+2010-02-20  Armin Weatherwax  <Armin.Weatherwax@gmail.com>
+
+        * Fixed an error at shutdown (gSavedSettings.cleanup).
+
+          modified:   linden/indra/newview/llappviewer.cpp
+
+
 2010-02-19  Armin Weatherwax  <Armin.Weatherwax@gmail.com>
 
         * Fixed Linux file picker not showing WAV files.
diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp
index 1eac043..e4cd3af 100644
--- a/linden/indra/newview/llappviewer.cpp
+++ b/linden/indra/newview/llappviewer.cpp
@@ -1371,7 +1371,6 @@ bool LLAppViewer::cleanup()
         // save all settings, even if equals defaults
         gCrashSettings.saveToFile(crash_settings_filename, FALSE);
 
-        gSavedSettings.cleanup();
         gColors.cleanup();
         gCrashSettings.cleanup();
 
@@ -1425,6 +1424,9 @@ bool LLAppViewer::cleanup()
         delete sImageDecodeThread;
     sImageDecodeThread = NULL;
 
+        gSavedSettings.cleanup();//do this after last time gSavedSettings is used  *surprise*
+
+
         //Note:
         //LLViewerMedia::cleanupClass() has to be put before gImageList.shutdown()
         //because some new image might be generated during cleaning up media. --bao