Bug 1312332 - Use stopVideo as intended. r?jib draft bug_1312332
authorAndreas Pehrson <pehrsons@gmail.com>
Mon, 24 Oct 2016 08:01:41 +0200
changeset 428528 7a56895281db3e698c63b4760d1be8255bbab110
parent 428476 215f9686117673a2c914ed207bc7da9bb8d741ad
child 534750 5fbf7300a527a2e4de39e28d91e1b64d205270b2
push id33327
push userbmo:pehrson@telenordigital.com
push dateMon, 24 Oct 2016 06:02:50 +0000
reviewersjib
bugs1312332
milestone52.0a1
Bug 1312332 - Use stopVideo as intended. r?jib MozReview-Commit-ID: JreGgjDwfam
dom/media/MediaManager.cpp
--- a/dom/media/MediaManager.cpp
+++ b/dom/media/MediaManager.cpp
@@ -3623,17 +3623,17 @@ GetUserMediaCallbackMediaStreamListener:
   MOZ_ASSERT(!stopAudio || mAudioDevice,
              "If there's a pending stop for audio, there must be an audio device");
   MOZ_ASSERT(!stopVideo || !mVideoStopped,
              "If there's a pending stop for video, video must not have been stopped");
   MOZ_ASSERT(!stopVideo || mVideoDevice,
              "If there's a pending stop for video, there must be a video device");
 
   if ((stopAudio || mAudioStopped || !mAudioDevice) &&
-      (stopAudio || mVideoStopped || !mVideoDevice)) {
+      (stopVideo || mVideoStopped || !mVideoDevice)) {
     // All tracks stopped.
     Stop();
     return;
   }
 
   mAudioStopped |= stopAudio;
   mVideoStopped |= stopVideo;