Merge branch '1904'

Authored by mardelle on Jun 14 2019, 1:14 PM.

Description

Merge branch '1904'

Merged Changes

CommitAuthorDetailsCommitted
83ab6e7bb147mardelle
Fix crash loading playlist with different fps. Related to #250 
Jun 14 2019