diff options
| author | Callum Prentice <callum@gmail.com> | 2020-06-02 13:13:53 -0700 |
|---|---|---|
| committer | Callum Prentice <callum@gmail.com> | 2020-06-02 13:13:53 -0700 |
| commit | d4a38abdf593a2f1f3cdf1de9bdbf043118cea3a (patch) | |
| tree | 6ec2f986f1f988f60cc0282136277fd046d05975 /indra/llaudio/llaudioengine_openal.cpp | |
| parent | a01f29761263314c21dd4905f05124f4c15df502 (diff) | |
| parent | 1702a65665879d0c68df4c6b4fdb60f815ab7abb (diff) | |
Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into DRTVWR-512
Diffstat (limited to 'indra/llaudio/llaudioengine_openal.cpp')
| -rw-r--r-- | indra/llaudio/llaudioengine_openal.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/indra/llaudio/llaudioengine_openal.cpp b/indra/llaudio/llaudioengine_openal.cpp index e6ac586618..a38d8291fa 100644 --- a/indra/llaudio/llaudioengine_openal.cpp +++ b/indra/llaudio/llaudioengine_openal.cpp @@ -52,7 +52,7 @@ LLAudioEngine_OpenAL::~LLAudioEngine_OpenAL() } // virtual -bool LLAudioEngine_OpenAL::init(const S32 num_channels, void* userdata) +bool LLAudioEngine_OpenAL::init(const S32 num_channels, void* userdata, const std::string &app_title) { mWindGen = NULL; LLAudioEngine::init(num_channels, userdata); @@ -239,6 +239,13 @@ bool LLAudioChannelOpenAL::isPlaying() bool LLAudioChannelOpenAL::updateBuffer() { + if (!mCurrentSourcep) + { + // This channel isn't associated with any source, nothing + // to be updated + return false; + } + if (LLAudioChannel::updateBuffer()) { // Base class update returned true, which means that we need to actually |