From 4dc82ae097393e8a66c7f6f3cb215459654d88a8 Mon Sep 17 00:00:00 2001
From: Jason Felds <jafelds@gmail.com>
Date: Mon, 30 Oct 2006 01:52:20 +0000
Subject: [PATCH] Fix up the #SMxxx tag output (thanks xbskid).

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

diff --git a/stepmania/src/NotesLoaderDWI.cpp b/stepmania/src/NotesLoaderDWI.cpp
index 2ae5ec4cec..e084e38320 100644
--- a/stepmania/src/NotesLoaderDWI.cpp
+++ b/stepmania/src/NotesLoaderDWI.cpp
@@ -583,7 +583,14 @@ bool DWILoader::LoadFromDWIFile( const RString &sPath, Song &out )
 		out.m_sSubTitleTranslit = m_sTempSubTitle;
 	}
 	else
-		out.m_sSubTitle = m_sTempSubTitle;
+	{
+		GetMainAndSubTitlesFromFullTitle( m_sTempSMTitle, RString(), m_sTempSubTitleOnSameLine );
+		ConvertString( m_sTempSubTitleOnSameLine, "utf-8,english" );
+		if ( 0!=stricmp(m_sTempSubTitleOnSameLine, "") )
+			out.m_sSubTitle = "";
+		else
+			out.m_sSubTitle = m_sTempSubTitle;
+	}
 
 	if ( m_sTempSMArtist != "" )
 	{
@@ -591,7 +598,7 @@ bool DWILoader::LoadFromDWIFile( const RString &sPath, Song &out )
 		out.m_sArtistTranslit = m_sTempArtist;
 	}
 	else
-		out.m_sArtist = m_sTempArtist;
+		out.m_sArtist = m_sTempArtist;	
 
 	return true;
 }
diff --git a/stepmania/src/NotesLoaderDWI.h b/stepmania/src/NotesLoaderDWI.h
index cf48414bad..8389024d8b 100644
--- a/stepmania/src/NotesLoaderDWI.h
+++ b/stepmania/src/NotesLoaderDWI.h
@@ -36,6 +36,8 @@ private:
 	RString m_sTempTitle;
 	RString m_sTempSubTitle;
 	RString m_sTempArtist;
+	RString m_sTempSubTitleOnSameLine;
+
 };
 
 #endif