merge

src/Song.cpp

@@ -588,8 +588,12 @@ void Song::TidyUpData( bool fromCache, bool duringCache )
 	// is the CDTitle.
 
 	CHECKPOINT_M( "Looking for images..." );
-    
-    if( !fromCache )
+
+	// HACK: DWI/KSF files require searching the file system for this info.
+    RString extension = GetExtension(this->m_sSongFileName);
+	extension.MakeLower();
+	
+    if( extension == "dwi" || extension == "ksf" || !fromCache )
     {
 
         // First, check the file name for hints.
@@ -804,7 +808,7 @@ void Song::TidyUpData( bool fromCache, bool duringCache )
 
 	// If no BGChanges are specified and there are movies in the song directory, then assume
 	// they are DWI style where the movie begins at beat 0.
-	if( !HasBGChanges() && !fromCache )
+	if( extension == "dwi" || extension == "ksf" || (!HasBGChanges() && !fromCache) )
 	{
 		vector<RString> arrayPossibleMovies;
 		GetDirListing( m_sSongDir + RString("*.ogv"), arrayPossibleMovies );