Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 00:36:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Protections against null pointers

Browse source
This commit is contained in:
Atlante45 2014-09-02 12:56:12 -07:00
parent 872ec21822
commit a1e6d9e7a1
2 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libraries/avatars/src/AvatarData.cpp
View file

@ -649,11 +649,15 @@ void AvatarData::startPlaying() {
} }
void AvatarData::setPlayFromCurrentLocation(bool playFromCurrentLocation) { void AvatarData::setPlayFromCurrentLocation(bool playFromCurrentLocation) {
_player->setPlayFromCurrentLocation(playFromCurrentLocation); if (_player) {
_player->setPlayFromCurrentLocation(playFromCurrentLocation);
}
} }
void AvatarData::setPlayerLoop(bool loop) { void AvatarData::setPlayerLoop(bool loop) {
_player->setLoop(loop); if (_player) {
_player->setLoop(loop);
}
} }
void AvatarData::play() { void AvatarData::play() {

7
libraries/script-engine/src/ScriptEngine.cpp
View file

@ -186,6 +186,13 @@ void ScriptEngine::setIsAvatar(bool isAvatar) {
_avatarIdentityTimer->start(AVATAR_IDENTITY_PACKET_SEND_INTERVAL_MSECS); _avatarIdentityTimer->start(AVATAR_IDENTITY_PACKET_SEND_INTERVAL_MSECS);
_avatarBillboardTimer->start(AVATAR_BILLBOARD_PACKET_SEND_INTERVAL_MSECS); _avatarBillboardTimer->start(AVATAR_BILLBOARD_PACKET_SEND_INTERVAL_MSECS);
} }
if (!_isAvatar) {
delete _avatarIdentityTimer;
_avatarIdentityTimer = NULL;
delete _avatarBillboardTimer;
_avatarBillboardTimer = NULL;
}
} }
void ScriptEngine::setAvatarData(AvatarData* avatarData, const QString& objectName) { void ScriptEngine::setAvatarData(AvatarData* avatarData, const QString& objectName) {