Changed NotesLoaderBMS to not crash when trying to set StepsTypeStr for an unrecognized StepsType. Removed ConfOption for ShowSelectGroup from ScreenOptionsMasterPrefs because the preference does not exist.

2015-10-23 20:42:49 -06:00
parent 7ed09304d0
commit da2db95365
2 changed files with 9 additions and 3 deletions
@@ -923,7 +923,14 @@ void BMSChartReader::CalculateStepsType()
 {
 	nonEmptyTracksCount = nonEmptyTracks.size();
 	out->m_StepsType = DetermineStepsType();
-	out->m_StepsTypeStr = GAMEMAN->GetStepsTypeInfo(out->m_StepsType).szName;
+	if(out->m_StepsType == StepsType_Invalid)
+	{
+		out->m_StepsTypeStr = "BMS_loaded_invalid_stepstype";
+	}
+	else
+	{
+		out->m_StepsTypeStr = GAMEMAN->GetStepsTypeInfo(out->m_StepsType).szName;
+	}
 }

 enum BmsRawChannel
@@ -1766,4 +1773,4 @@ bool BMSLoader::LoadFromDir( const RString &sDir, Song &out )
 * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
 * OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 * PERFORMANCE OF THIS SOFTWARE.
- */
+ */