Add destruction check in Stream.switch().

This check is necessary since Stream does not own its StreamInfo, so the async part of switch() may complete even if Stream.destroy() is called Change-Id: I5185c0df3184924d0f34d39e235b1155f01dd273
shaka-project · Aug 21, 2015 · e02f74a · e02f74a
1 parent df29182
commit e02f74a
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/lib/media/stream.js b/lib/media/stream.js
@@ -264,6 +264,11 @@ shaka.media.Stream.prototype.switch = function(
   Promise.all(async).then(shaka.util.TypedBind(this,
       /** @param {!Array} results */
       function(results) {
+        if (!this.video_) {
+          // We got destroyed.
+          return;
+        }
+
         var previousStreamInfo = this.streamInfo_;
 
         this.streamInfo_ = streamInfo;