zaki
/
irrlicht
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Drop some objects in reverse order of grabbing in CGUIEnvironment. 

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@4237 dfc29bdd-3216-0410-991c-e03cc46cb475
master
cutealien 2012-07-11 17:46:32 +00:00
parent 1e2341226a
commit b589323a49
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
source/Irrlicht/CGUIEnvironment.cpp
View File

@ -112,12 +112,6 @@ CGUIEnvironment::~CGUIEnvironment()
Hovered = 0;
}
if (Driver)
{
Driver->drop();
Driver = 0;
}
if (Focus)
{
Focus->drop();
@ -130,18 +124,6 @@ CGUIEnvironment::~CGUIEnvironment()
ToolTip.Element = 0;
}
if (FileSystem)
{
FileSystem->drop();
FileSystem = 0;
}
if (Operator)
{
Operator->drop();
Operator = 0;
}
// drop skin
if (CurrentSkin)
{
@ -163,6 +145,24 @@ CGUIEnvironment::~CGUIEnvironment()
// remove all factories
for (i=0; i<GUIElementFactoryList.size(); ++i)
GUIElementFactoryList[i]->drop();
if (Operator)
{
Operator->drop();
Operator = 0;
}
if (FileSystem)
{
FileSystem->drop();
FileSystem = 0;
}
if (Driver)
{
Driver->drop();
Driver = 0;
}
}