From f2c5bfcae707082b5b5c4a95c2cdc8f61b8f2dc5 Mon Sep 17 00:00:00 2001 From: Barinade Date: Tue, 26 Jan 2021 00:27:08 -0600 Subject: [PATCH] Don't load NoteData twice in NoteFieldPreview in loaded during init --- src/Etterna/Actor/Gameplay/NoteFieldPreview.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/Etterna/Actor/Gameplay/NoteFieldPreview.cpp b/src/Etterna/Actor/Gameplay/NoteFieldPreview.cpp index 8d7fdcc30e..d54e4ce4c0 100644 --- 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