From 474b621531b66129f463a9a01e7147de6520d67b Mon Sep 17 00:00:00 2001
From: Chris Danford <chrisdanford@users.sourceforge.net>
Date: Sat, 23 Apr 2005 22:03:23 +0000
Subject: [PATCH] fix disk prefs clobbering user's changes made in-game.  Oops.

---
 stepmania/src/PrefsManager.cpp | 6 +-----
 stepmania/src/PrefsManager.h   | 2 +-
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/stepmania/src/PrefsManager.cpp b/stepmania/src/PrefsManager.cpp
index 3ed7540f9b..4b9e260afb 100644
--- a/stepmania/src/PrefsManager.cpp
+++ b/stepmania/src/PrefsManager.cpp
@@ -574,12 +574,8 @@ void PrefsManager::ReadGlobalPrefsFromIni( const IniFile &ini )
 		(*p)->ReadFrom( ini );
 }
 
-void PrefsManager::SaveGlobalPrefsToDisk()
+void PrefsManager::SaveGlobalPrefsToDisk() const
 {
-	// Re-read before writing so we don't clobber any changes the use made while 
-	// the program was running.
-	ReadGlobalPrefsFromDisk();
-
 	IniFile ini;
 	SaveGlobalPrefsToIni( ini );
 	ini.WriteFile( STEPMANIA_INI_PATH );
diff --git a/stepmania/src/PrefsManager.h b/stepmania/src/PrefsManager.h
index a22f16b5df..5ffea8ecdd 100644
--- a/stepmania/src/PrefsManager.h
+++ b/stepmania/src/PrefsManager.h
@@ -306,7 +306,7 @@ public:
 	void SaveGlobalPrefsToIni( IniFile &ini ) const;
 
 	void ReadGlobalPrefsFromDisk();
-	void SaveGlobalPrefsToDisk();
+	void SaveGlobalPrefsToDisk() const;
 
 	void ResetToFactoryDefaults();