From 41d72dab39feddf199534d64684d51d7259a890a Mon Sep 17 00:00:00 2001 From: andreykproductengine Date: Mon, 19 Dec 2016 16:55:31 +0200 Subject: MAINT-6761 Video that is not playing or paused should be stopped --- indra/newview/llviewermedia.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra') diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp index bf98650afd..0a0af9c108 100644 --- a/indra/newview/llviewermedia.cpp +++ b/indra/newview/llviewermedia.cpp @@ -951,7 +951,7 @@ void LLViewerMedia::setAllMediaPaused(bool val) pimpl->play(); } } - else if (pimpl->isMediaTimeBased() && pimpl->mMediaSource) + else if (pimpl->isMediaTimeBased() && pimpl->mMediaSource && (pimpl->isMediaPlaying() || pimpl->isMediaPaused())) { pimpl->pause(); } -- cgit v1.2.3