diff options
| author | andreykproductengine <akleshchev@productengine.com> | 2016-12-19 16:55:31 +0200 |
|---|---|---|
| committer | andreykproductengine <akleshchev@productengine.com> | 2016-12-19 16:55:31 +0200 |
| commit | 41d72dab39feddf199534d64684d51d7259a890a (patch) | |
| tree | 7461162cf5091a54840bbd1e2d4b0cbaed059744 /indra/newview | |
| parent | 7dcea20c4d46e95a9fe1c7eb8b0d8f39de61b5a2 (diff) | |
MAINT-6761 Video that is not playing or paused should be stopped
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llviewermedia.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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(); } |