fix drag handle segv, new app icons

[goodguy/history.git] / cinelerra-5.1 / cinelerra / trackcanvas.C

diff --git a/cinelerra-5.1/cinelerra/trackcanvas.C b/cinelerra-5.1/cinelerra/trackcanvas.C
index f1afafdf08a34bb71e116b30a4099646dbff2d36..8ff10d201436032da96830af9e896bf38e342c76 100644 (file)
--- a/cinelerra-5.1/cinelerra/trackcanvas.C
+++ b/cinelerra-5.1/cinelerra/trackcanvas.C
@@ -3619,7 +3619,7 @@ void TrackCanvas::update_drag_handle()
                double position = edit_mode != MOVE_NO_EDITS &&
                        ( session->drag_handle || edit_mode == MOVE_ONE_EDIT ) ?
                                session->drag_position : session->drag_start;
-               Track *track = session->drag_edit->edits->track;
+               Track *track = session->drag_handle_track();
                int64_t pos = track->to_units(position, 0);
                render_handle_frame(edl, pos, shift_down() ? 0 :
                        session->drag_handle ? 1 : 2);
@@ -3670,7 +3670,7 @@ int TrackCanvas::render_handle_frame(EDL *edl, int64_t pos, int mode)
                break; }
        case 1:
        case 2: {
-               Track *track = mwindow->session->drag_edit->edits->track;
+               Track *track = mwindow->session->drag_handle_track();
                double position = track->from_units(mode == 1 ? left : pos);
                if( position < 0 ) position = 0;
                edl->local_session->set_selectionstart(position);