From 7877e7689a15fec6183b7c04c7a7435f40619e92 Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Sat, 22 Feb 2003 21:56:59 +0000
Subject: [PATCH] Don't Init() in FromString.

---
 stepmania/src/PlayerOptions.cpp | 4 +++-
 stepmania/src/SongOptions.cpp   | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/stepmania/src/PlayerOptions.cpp b/stepmania/src/PlayerOptions.cpp
index 871a1b9623..17121e33f1 100644
--- a/stepmania/src/PlayerOptions.cpp
+++ b/stepmania/src/PlayerOptions.cpp
@@ -110,9 +110,11 @@ CString PlayerOptions::GetString()
 	return sReturn;
 }
 
+/* Options are added to the current settings; call Init() beforehand if
+ * you don't want this. */
 void PlayerOptions::FromString( CString sOptions )
 {
-	Init();
+//	Init();
 	sOptions.MakeLower();
 	CStringArray asBits;
 	split( sOptions, ",", asBits, true );
diff --git a/stepmania/src/SongOptions.cpp b/stepmania/src/SongOptions.cpp
index 6d4c77487c..16dc91980f 100644
--- a/stepmania/src/SongOptions.cpp
+++ b/stepmania/src/SongOptions.cpp
@@ -57,9 +57,11 @@ CString SongOptions::GetString()
 	return sReturn;
 }
 
+/* Options are added to the current settings; call Init() beforehand if
+ * you don't want this. */
 void SongOptions::FromString( CString sOptions )
 {
-	Init();
+//	Init();
 	sOptions.MakeLower();
 	CStringArray asBits;
 	split( sOptions, ",", asBits, true );