Fix SDL device compilation. VideoDriver is now always dropped after Scenemanager and FileSystem after those two to prevent memory-leaks in some situations.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@4724 dfc29bdd-3216-0410-991c-e03cc46cb475
master
cutealien 2014-03-14 15:13:41 +00:00
parent 3401273272
commit 0adb750092
2 changed files with 6 additions and 4 deletions

View File

@ -754,7 +754,7 @@ void CIrrDeviceSDL::maximizeWindow()
} }
//! Get the position of this window on screen //! Get the position of this window on screen
core::position2di getWindowPosition() core::position2di CIrrDeviceSDL::getWindowPosition()
{ {
return core::position2di(-1, -1); return core::position2di(-1, -1);
} }

View File

@ -55,16 +55,18 @@ CIrrDeviceStub::CIrrDeviceStub(const SIrrlichtCreationParameters& params)
CIrrDeviceStub::~CIrrDeviceStub() CIrrDeviceStub::~CIrrDeviceStub()
{ {
VideoModeList->drop(); VideoModeList->drop();
FileSystem->drop();
if (GUIEnvironment) if (GUIEnvironment)
GUIEnvironment->drop(); GUIEnvironment->drop();
if (SceneManager)
SceneManager->drop();
if (VideoDriver) if (VideoDriver)
VideoDriver->drop(); VideoDriver->drop();
if (SceneManager) if ( FileSystem )
SceneManager->drop(); FileSystem->drop();
if (InputReceivingSceneManager) if (InputReceivingSceneManager)
InputReceivingSceneManager->drop(); InputReceivingSceneManager->drop();