Skip to content

Commit

Permalink
fix merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
nicosang committed Jun 6, 2017
1 parent adcd08a commit 4772dfc
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/streaming/controllers/PlaybackController.js
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ function PlaybackController() {
wallclockTimeIntervalId = null;
playOnceInitialized = false;
commonEarliestTime = {};
if (videoModel && element) {
if (videoModel) {
eventBus.off(Events.DATA_UPDATE_COMPLETED, onDataUpdateCompleted, this);
eventBus.off(Events.BUFFER_LEVEL_STATE_CHANGED, onBufferLevelStateChanged, this);
eventBus.off(Events.BYTES_APPENDED, onBytesAppended, this);
Expand Down

0 comments on commit 4772dfc

Please sign in to comment.