attached clip markers to footage markers

This commit is contained in:
itsmattkc
2019-02-04 01:34:51 +11:00
parent 87df07e6e7
commit e83d87d6ba
7 changed files with 88 additions and 35 deletions
+2 -2
View File
@@ -151,8 +151,8 @@ void Clip::queue_remove_earliest() {
}
QVector<Marker> &Clip::get_markers() {
if (media != nullptr && media->get_type() == MEDIA_TYPE_SEQUENCE) {
return media->to_sequence()->markers;
if (media != nullptr) {
return media->get_markers();
}
return markers;
}