diff options
| author | Tim Mayberry <mojofunk@gmail.com> | 2015-08-14 16:04:24 +1000 |
|---|---|---|
| committer | Tim Mayberry <mojofunk@gmail.com> | 2015-08-14 16:04:24 +1000 |
| commit | 07dc8059199e64b49c35257e03ac8e36305fad5e (patch) | |
| tree | e603d4e44b9d0dd9112c8a5514d4f3e13acd2d7d /gtk2_ardour | |
| parent | c342769925248bbc48451e5305acf1b0551a8b6f (diff) | |
Fix bug #6337, clicking in canvas without session loaded causes crash
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/editor_drag.cc | 4 | ||||
| -rw-r--r-- | gtk2_ardour/editor_mouse.cc | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/gtk2_ardour/editor_drag.cc b/gtk2_ardour/editor_drag.cc index 9162828484..4d343f3726 100644 --- a/gtk2_ardour/editor_drag.cc +++ b/gtk2_ardour/editor_drag.cc @@ -3291,6 +3291,10 @@ CursorDrag::CursorDrag (Editor* e, EditorCursor& c, bool s) void CursorDrag::fake_locate (framepos_t t) { + if (_editor->session () == 0) { + return; + } + _editor->playhead_cursor->set_position (t); Session* s = _editor->session (); diff --git a/gtk2_ardour/editor_mouse.cc b/gtk2_ardour/editor_mouse.cc index 0d9ad69181..5597c5b06e 100644 --- a/gtk2_ardour/editor_mouse.cc +++ b/gtk2_ardour/editor_mouse.cc @@ -1139,7 +1139,7 @@ Editor::button_press_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemTyp } //not rolling, range mode click + join_play_range : locate the PH here - if ( !_drags->active () && !_session->transport_rolling() && ( effective_mouse_mode() == MouseRange ) && ARDOUR_UI::config()->get_follow_edits() ) { + if ( !_drags->active () && _session && !_session->transport_rolling() && ( effective_mouse_mode() == MouseRange ) && ARDOUR_UI::config()->get_follow_edits() ) { framepos_t where = canvas_event_sample (event); snap_to(where); _session->request_locate (where, false); |