From 97c8218463fa77dec206d79100c6b90dc8dbfefe Mon Sep 17 00:00:00 2001 From: Latif Khalifa Date: Tue, 17 Sep 2013 01:48:11 +0200 Subject: [PATCH 1/2] Don't crash when chanelp returned is null --- indra/llaudio/llaudioengine.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/llaudio/llaudioengine.cpp b/indra/llaudio/llaudioengine.cpp index f07965877..aab511ef8 100644 --- a/indra/llaudio/llaudioengine.cpp +++ b/indra/llaudio/llaudioengine.cpp @@ -399,7 +399,7 @@ void LLAudioEngine::idle(F32 max_decode_time) } LLAudioChannel *channelp = sourcep->getChannel(); - bool is_stopped = channelp && channelp->isPlaying(); + bool is_stopped = !channelp || !channelp->isPlaying(); if (is_stopped || (sourcep->isLoop() && channelp->mLoopedThisFrame)) { // This sound isn't playing, so we just process move the queue From afec67e59679ec4bf8193b498160819c705aed0a Mon Sep 17 00:00:00 2001 From: Latif Khalifa Date: Tue, 17 Sep 2013 01:48:39 +0200 Subject: [PATCH 2/2] Kill a compiler warning --- indra/newview/daeexport.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/newview/daeexport.cpp b/indra/newview/daeexport.cpp index 6beff624b..0938bd1cb 100644 --- a/indra/newview/daeexport.cpp +++ b/indra/newview/daeexport.cpp @@ -814,7 +814,7 @@ bool DAESaver::saveDAE(std::string filename) v4adapt verts(face->mPositions); v4adapt norms(face->mNormals); - LLVector2* newCoord; + LLVector2* newCoord = NULL; if (applyTexCoord) {