Skip to content

Commit

Permalink
fix: bad merge
Browse files Browse the repository at this point in the history
  • Loading branch information
ianshade committed Apr 13, 2021
1 parent 9993e99 commit dd6ea93
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/devices/vizMSE.ts
Original file line number Diff line number Diff line change
Expand Up @@ -931,7 +931,7 @@ class VizMSEManager extends EventEmitter {
}

this._triggerCommandSent()
this._triggerLoadAllElements(true).then(() => {
this._triggerLoadAllElements(loadTwice).then(() => {
this._triggerCommandSent()
this._activeRundownPlaylistId = rundownPlaylistId
this._hasActiveRundown = true
Expand Down Expand Up @@ -1410,7 +1410,7 @@ class VizMSEManager extends EventEmitter {
_rev: ''
}
this.emit('updateMediaObject', e.hash, mediaObject)
} else if (!cachedEl) {
} else {
this.emit('updateMediaObject', e.hash, null)
}
}
Expand Down

0 comments on commit dd6ea93

Please sign in to comment.