- Merged r1236, r1237, and r1240 of GZDoom.

SVN r3279 (trunk)
This commit is contained in:
Braden Obrzut 2011-08-14 23:53:20 +00:00
commit 5c81cf20ba
4 changed files with 17 additions and 3 deletions

View file

@ -533,7 +533,12 @@ void Barrier(DObject *pointing, DObject *pointed)
void DelSoftRootHead()
{
if (SoftRoots != NULL) delete SoftRoots;
if (SoftRoots != NULL)
{
// Don't let the destructor print a warning message
SoftRoots->ObjectFlags |= OF_YesReallyDelete;
delete SoftRoots;
}
SoftRoots = NULL;
}