oak-team/oak-editor
3
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

basic segfault handling and fixed timeline crash

Browse Source
This commit is contained in:
itsmattkc
2019-05-09 10:45:45 +10:00
parent baed0c2045
commit fc94881865
5 changed files with 114 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ui/timelineview.cpp
+2 -2
View File
@@ -130,7 +130,8 @@ void TimelineView::show_context_menu(const QPoint& pos) {
ParentTimeline()->cursor_track = getTrackFromScreenPoint(pos.y());
// check if the space the cursor is currently at is empty
if (ParentTimeline()->cursor_track->GetClipFromPoint(ParentTimeline()->cursor_frame) == nullptr) {
if (ParentTimeline()->cursor_track != nullptr
&& ParentTimeline()->cursor_track->GetClipFromPoint(ParentTimeline()->cursor_frame) == nullptr) {
QAction* ripple_delete_action = menu.addAction(tr("R&ipple Delete Empty Space"));
connect(ripple_delete_action, SIGNAL(triggered(bool)), ParentTimeline(), SLOT(ripple_delete_empty_space()));
}
@@ -3294,7 +3295,6 @@ Track *TimelineView::getTrackFromScreenPoint(int y) {
}
int TimelineView::getScreenPointFromTrack(Track *track) {
qDebug() << "Getting screen point from" << track << track->Index();
return getScreenPointFromTrackIndex(track->Index());
}