From da1bc52be4eb90043bd035bad09cfbfe1a0474c5 Mon Sep 17 00:00:00 2001 From: fallenoak Date: Tue, 21 Feb 2023 14:01:56 -0600 Subject: [PATCH] chore(model): clarify logic in callback load list traversal --- src/model/CM2Shared.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/model/CM2Shared.cpp b/src/model/CM2Shared.cpp index 36606cc..3dcd607 100644 --- a/src/model/CM2Shared.cpp +++ b/src/model/CM2Shared.cpp @@ -271,8 +271,10 @@ int32_t CM2Shared::FinishLoadingSkinProfile(uint32_t size) { this->m_skinProfileLoaded = 1; - while (this->m_callbackList) { - CM2Model* model = this->m_callbackList; + for (auto model = this->m_callbackList; model; model = this->m_callbackList) { + STORM_ASSERT(model->m_callbackPrev); + STORM_ASSERT(*model->m_callbackPrev == this->m_callbackList); + model->UnlinkFromCallbackList(); model->InitializeLoaded(); }