immibis
/
colobot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix crash when destroying unpowered PowerPlant with Titanium 

Appendix to pull #1206
1008-fix
tomangelo2 2019-01-30 21:06:07 +01:00 committed by Mateusz Przybył
parent 0f6e1d7d4a
commit a46750ede2
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/object/auto/autopowerplant.cpp
View File

@ -82,12 +82,14 @@ void CAutoPowerPlant::DeleteObject(bool all)
CObject* cargo = SearchMetal(); CObject* cargo = SearchMetal();
if ( cargo != nullptr ) if ( cargo != nullptr )
{ {
m_object->SetPower(nullptr);
CObjectManager::GetInstancePointer()->DeleteObject(cargo); CObjectManager::GetInstancePointer()->DeleteObject(cargo);
} }
cargo = SearchPower(); cargo = SearchPower();
if ( cargo != nullptr ) if ( cargo != nullptr )
{ {
m_object->SetPower(nullptr);
CObjectManager::GetInstancePointer()->DeleteObject(cargo); CObjectManager::GetInstancePointer()->DeleteObject(cargo);
} }
} }