summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorRye Mutt <rye@alchemyviewer.org>2024-07-27 11:15:00 -0400
committerGitHub <noreply@github.com>2024-07-27 18:15:00 +0300
commitc98498e6ea04570a6234c13c543105df69b58f46 (patch)
tree8d3807fb5e6ffd82c3abd115a41cfd5cf55c2ceb /indra/newview
parentfceec45641cf6a4b7eecaf37ea080a184c279239 (diff)
Destroy stream process when stopping audio stream to allow restarting in the case of stuck or errored libvlc (#2124)
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llviewermedia_streamingaudio.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llviewermedia_streamingaudio.cpp b/indra/newview/llviewermedia_streamingaudio.cpp
index af3a21c183..b68ffbe1a2 100644
--- a/indra/newview/llviewermedia_streamingaudio.cpp
+++ b/indra/newview/llviewermedia_streamingaudio.cpp
@@ -70,6 +70,8 @@ void LLStreamingAudio_MediaPlugins::start(const std::string& url)
LL_INFOS() << "setting stream to NULL"<< LL_ENDL;
mURL.clear();
mMediaPlugin->stop();
+ delete mMediaPlugin;
+ mMediaPlugin = nullptr;
}
}
@@ -79,6 +81,8 @@ void LLStreamingAudio_MediaPlugins::stop()
if(mMediaPlugin)
{
mMediaPlugin->stop();
+ delete mMediaPlugin;
+ mMediaPlugin = nullptr;
}
mURL.clear();