Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Changed: Delete SoundMngr to avoid memory leaks

Browse source
This commit is contained in:
kervala 2016-05-17 10:59:28 +02:00
parent 90bdb65511
commit 049e35d930
4 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
code/ryzom/client/src/init.cpp
View file

@ -1555,7 +1555,8 @@ void postlogInit()
{ {
nlwarning("init : Error when creating 'SoundMngr' : %s", e.what()); nlwarning("init : Error when creating 'SoundMngr' : %s", e.what());
// leak the alocated sound manager... // leak the alocated sound manager...
SoundMngr = 0; delete SoundMngr;
SoundMngr = NULL;
} }
// Play Music just after the SoundMngr is inited // Play Music just after the SoundMngr is inited

3
code/ryzom/client/src/main_loop_utilities.cpp
View file

@ -329,7 +329,8 @@ void updateFromClientCfg()
catch(const Exception &e) catch(const Exception &e)
{ {
nlwarning("init : Error when creating 'SoundMngr' : %s", e.what()); nlwarning("init : Error when creating 'SoundMngr' : %s", e.what());
SoundMngr = 0; delete SoundMngr;
SoundMngr = NULL;
} }
// re-init with good SFX/Music Volume // re-init with good SFX/Music Volume

4
code/ryzom/client/src/release.cpp
View file

@ -478,7 +478,7 @@ void releaseOutGame()
if(SoundMngr) if(SoundMngr)
{ {
delete SoundMngr; delete SoundMngr;
SoundMngr = 0; SoundMngr = NULL;
} }
// Delete the driver. // Delete the driver.
@ -573,7 +573,7 @@ void release()
if(SoundMngr) if(SoundMngr)
{ {
delete SoundMngr; delete SoundMngr;
SoundMngr = 0; SoundMngr = NULL;
} }
// Release the Entities Animation Manager // Release the Entities Animation Manager

2
code/ryzom/client/src/user_entity.cpp
View file

@ -2381,7 +2381,7 @@ void CUserEntity::updateSound(const TTime &time)
H_AUTO_USE ( RZ_Client_Update_Sound ); H_AUTO_USE ( RZ_Client_Update_Sound );
// no sound manager, no need to update sound // no sound manager, no need to update sound
if (SoundMngr == 0) if (SoundMngr == NULL)
return; return;
if (!(StereoHMD && true)) // TODO: ClientCfg.Headphone if (!(StereoHMD && true)) // TODO: ClientCfg.Headphone