Merge branch 'bpm-crash' into develop

etternagame · Mar 8, 2024 · b358868 · b358868
2 parents 6ccb209 + 4feafbb
commit b358868
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git a/src/Etterna/Models/Misc/TimingData.cpp b/src/Etterna/Models/Misc/TimingData.cpp
@@ -1421,11 +1421,6 @@ TimingData::BuildAndGetEtaner(const std::vector<int>& nerv)
 			}
 			last_time = next_event_time;
 			bps = ToBPM(bpms[i])->GetBPM() / 60.f;
-			// set any 0 bpm segments to the previous segment's bpm
-			if (bps <= 0) {
-				ToBPM(bpms[i])->SetBPM(ToBPM(bpms[i - 1])->GetBPM());
-				bps = ToBPM(bpms[i])->GetBPM() / 60.f;
-			}
 			lastbpmrow = event_row;
 		}
 

diff --git a/src/Etterna/Models/NoteLoaders/NotesLoaderSM.cpp b/src/Etterna/Models/NoteLoaders/NotesLoaderSM.cpp
@@ -454,7 +454,7 @@ SMLoader::ParseBPMs(std::vector<pair<float, float>>& out,
 		if (fNewBPM == 0) {
 //			LOG->UserLog(
 //			  "Song file", this->GetSongTitle(), "has a zero BPM; ignored.");
-//			continue;
+			continue;
 		}
 
 		out.emplace_back(std::make_pair(fBeat, fNewBPM));