marko10_000
/
openclonk
forked from Mirrors/openclonk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

! Fix crash on shutdown due to object deinitialization order

Sven Eberhardt 2012-10-12 19:00:23 +02:00
parent e191cf0e71
commit 4890015537
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/C4Globals.cpp
View File

@ -33,6 +33,8 @@
#ifdef _DEBUG
C4Set<C4PropList *> C4PropList::PropLists;
C4Set<C4PropListNumbered *> C4PropListNumbered::PropLists;
int32_t C4PropListNumbered::EnumerationIndex = 0;
#endif
C4StringTable Strings;
C4AulScriptEngine ScriptEngine;

5
src/script/C4PropList.cpp
View File

@ -76,9 +76,6 @@ C4PropListStatic * C4PropList::NewAnon(C4PropList * prototype, const C4PropListS
return new C4PropListStatic(prototype, parent, key);
}
C4Set<C4PropListNumbered *> C4PropListNumbered::PropLists;
int32_t C4PropListNumbered::EnumerationIndex = 0;
C4PropList *C4PropListNumbered::GetByNumber(int32_t iNumber)
{
return PropLists.Get(iNumber);
@ -216,7 +213,7 @@ C4PropList::~C4PropList()
assert(PropLists.Has(this));
PropLists.Remove(this);
#endif
assert(!C4PropListNumbered::CheckPropList(this));
assert (!C4PropListNumbered::CheckPropList(this));
}
bool C4PropList::operator==(const C4PropList &b) const