Skip to content

Fix CResourceModelStreamer::FullyReleaseModel crash #3746

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Sep 27, 2024
+3 −3
Merged

Fix CResourceModelStreamer::FullyReleaseModel crash #3746

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7c65f86
Fix crash
TheNormalnij Sep 23, 2024
bb3d4ee
Revert "Fix crash"
TheNormalnij Sep 26, 2024
026ff21
Fix crash
TheNormalnij Sep 26, 2024
b4a8c4a
Fix typo
TheNormalnij Sep 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions Client/mods/deathmatch/logic/CClientModel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,6 @@ bool CClientModel::Deallocate()
if (!m_bAllocatedByUs)
return false;

if (m_pParentResource)
m_pParentResource->GetResourceModelStreamer()->FullyReleaseModel(m_iModelID);

SetParentResource(nullptr);

CModelInfo* pModelInfo = g_pGame->GetModelInfo(m_iModelID, true);
Expand Down
3 changes: 3 additions & 0 deletions Client/mods/deathmatch/logic/CClientModelManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,9 @@ bool CClientModelManager::Remove(const std::shared_ptr<CClientModel>& pModel)
int modelId = pModel->GetModelID();
if (m_Models[modelId] != nullptr)
{
CResource* perentResource = m_Models[modelId]->GetParentResource();
if (perentResource)
perentResource->GetResourceModelStreamer()->FullyReleaseModel(modelId);
m_Models[modelId]->RestoreEntitiesUsingThisModel();
m_Models[modelId] = nullptr;
m_modelCount--;
Expand Down
Loading