Merge IF I F**KED UP I'MA THROW MY PC OUT OF MY WINDOW

src/NotesLoaderBMS.cpp

@@ -520,7 +520,7 @@ StepsType BMSChartReader::DetermineStepsType()
 				case 7:
 				case 8:		return StepsType_beat_single7;
 				case 9:		return StepsType_popn_nine;
-				default:	return StepsType_Invalid;
+				default:	return StepsType_beat_single7;
 			}
 		case 2:	// couple/battle
 			return StepsType_dance_couple;
@@ -532,7 +532,7 @@ StepsType BMSChartReader::DetermineStepsType()
 				case 16:	return StepsType_beat_double7;
 				case 5:		return StepsType_popn_five;
 				case 9:		return StepsType_popn_nine;
-				default:	return StepsType_Invalid;
+				default:	return StepsType_beat_double7;
 			}
 		default:
 			LOG->UserLog( "Song file", in->path, "has an invalid #PLAYER value %d.", player );
@@ -912,6 +912,11 @@ bool BMSSongLoader::Load( RString fileName )
 
 void BMSSongLoader::AddToSong()
 {
+    if( loadedSteps.size() == 0 )
+    {
+        return;
+    }
+    
 	RString commonSubstring = "";
     
 	{

src/ScreenHowToPlay.cpp

@@ -145,7 +145,7 @@ void ScreenHowToPlay::Init()
 
 		const Style* pStyle = GAMESTATE->GetCurrentStyle();
 
-		Steps *pSteps = SongUtil::GetStepsByDescription( &m_Song, pStyle->m_StepsType, "" );
+    Steps *pSteps = SongUtil::GetClosestNotes( &m_Song, pStyle->m_StepsType, Difficulty_Beginner );
 		ASSERT_M( pSteps != NULL, ssprintf("No playable steps of StepsType '%s' for ScreenHowToPlay", StringConversion::ToString(pStyle->m_StepsType).c_str()) );
 		
 		pSteps->m_Timing.TidyUpData();

src/Song.cpp

@@ -826,7 +826,10 @@ void Song::TidyUpData( bool fromCache, bool duringCache )
 	/* Don't allow multiple Steps of the same StepsType and Difficulty (except
 	 * for edits). We should be able to use difficulty names as unique
 	 * identifiers for steps. */
-	SongUtil::AdjustDuplicateSteps( this );
+	if( !duringCache )
+    {
+        SongUtil::AdjustDuplicateSteps( this );
+    }
 }
 
 void Song::TranslateTitles()

src/Texture Font Generator/Texture Font Generator-net2008.vcproj

@@ -54,7 +54,7 @@
 				TreatWChar_tAsBuiltInType="true"
 				UsePrecompiledHeader="2"
 				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
+				Detect64BitPortabilityProblems="false"
 				DebugInformationFormat="4"
 			/>
 			<Tool
@@ -144,7 +144,7 @@
 				TreatWChar_tAsBuiltInType="true"
 				UsePrecompiledHeader="2"
 				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
+				Detect64BitPortabilityProblems="false"
 				DebugInformationFormat="3"
 			/>
 			<Tool