Fix bug where initial track duration is always derived from first track.

benwiley4000 · Apr 21, 2019 · ac4b6ab · ac4b6ab · benwiley4000 · Apr 21, 2019
1 parent 0643530
commit ac4b6ab
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/packages/core/src/PlayerContextProvider.js b/packages/core/src/PlayerContextProvider.js
@@ -111,7 +111,7 @@ export class PlayerContextProvider extends Component {
   constructor(props) {
     super(props);
     let currentTime = 0;
-    const activeTrackIndex = convertToNumberWithinIntervalBounds(
+    let activeTrackIndex = convertToNumberWithinIntervalBounds(
       props.startingTrackIndex,
       0
     );
@@ -127,6 +127,16 @@ export class PlayerContextProvider extends Component {
           initialStateSnapshot,
           props
         );
+        const {
+          activeTrackIndex: a,
+          currentTime: c
+        } = restoredStateFromSnapshot;
+        if (typeof a === 'number') {
+          activeTrackIndex = a;
+        }
+        if (typeof c === 'number') {
+          currentTime = c;
+        }
       } catch (err) {
         logWarning(err);
         logWarning('Loading Cassette state from snapshot failed.');