fix(FEC-10662): incorrect flow in destroy process (#512)

return promise which will be resolved or rejected at the end of reset.
kaltura · Dec 8, 2020 · 5ffe16c · 5ffe16c
1 parent a287fa4
commit 5ffe16c
Showing 1 changed file with 22 additions and 16 deletions.
diff --git a/src/engines/html5/media-source/adapters/native-adapter.js b/src/engines/html5/media-source/adapters/native-adapter.js
@@ -521,22 +521,28 @@ export default class NativeAdapter extends BaseMediaSourceAdapter {
    */
   destroy(): Promise<*> {
     NativeAdapter._logger.debug('destroy');
-    return super.destroy().then(() => {
-      this._drmHandler && this._drmHandler.destroy();
-      this._waitingEventTriggered = false;
-      this._progressiveSources = [];
-      this._loadPromise = null;
-      this._loadPromiseReject = null;
-      this._liveEdge = 0;
-      this._lastTimeUpdate = 0;
-      this._lastTimeDetach = NaN;
-      this._startTimeAttach = NaN;
-      this._videoDimensions = null;
-      this._clearHeartbeatTimeout();
-      if (this._liveDurationChangeInterval) {
-        clearInterval(this._liveDurationChangeInterval);
-        this._liveDurationChangeInterval = null;
-      }
+    return new Promise((resolve, reject) => {
+      super.destroy().then(
+        () => {
+          this._drmHandler && this._drmHandler.destroy();
+          this._waitingEventTriggered = false;
+          this._progressiveSources = [];
+          this._loadPromise = null;
+          this._loadPromiseReject = null;
+          this._liveEdge = 0;
+          this._lastTimeUpdate = 0;
+          this._lastTimeDetach = NaN;
+          this._startTimeAttach = NaN;
+          this._videoDimensions = null;
+          this._clearHeartbeatTimeout();
+          if (this._liveDurationChangeInterval) {
+            clearInterval(this._liveDurationChangeInterval);
+            this._liveDurationChangeInterval = null;
+          }
+          resolve();
+        },
+        () => reject
+      );
     });
   }