Don't load NoteData twice in NoteFieldPreview in loaded during init

etternagame · Jan 26, 2021 · f2c5bfc · f2c5bfc
1 parent 77abb15
commit f2c5bfc
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/src/Etterna/Actor/Gameplay/NoteFieldPreview.cpp b/src/Etterna/Actor/Gameplay/NoteFieldPreview.cpp
@@ -81,7 +81,13 @@ NoteFieldPreview::LoadFromNode(const XNode* pNode)
 		p_dummyNoteData->SetNumTracks(style->m_iColsPerPlayer);
 
 	Init(m_pPlayerState, noteFieldHeight);
-	LoadDummyNoteData();
+
+	// If NoteData was loaded in InitCommand, this isn't necessary
+	// It would be null if not loaded in InitCommand
+	if (m_pNoteData == nullptr)
+		Load(p_dummyNoteData,
+			 m_iDrawDistanceAfterTargetsPixels,
+			 m_iDrawDistanceBeforeTargetsPixels);
 }
 
 void