Set up selection when opening timeline.

[dcpomatic.git] / src / wx / content_panel.cc

diff --git a/src/wx/content_panel.cc b/src/wx/content_panel.cc
index 704f251691d62dcc0179f086fd93dd4a615e8cb1..9fc052e68e243dae6cc05601cd27babf84bc87de 100644 (file)
--- a/src/wx/content_panel.cc
+++ b/src/wx/content_panel.cc
@@ -277,8 +277,8 @@ ContentPanel::selection_changed ()
                }
        }
 
-       if (go_to && Config::instance()->jump_to_selected ()) {
-               _film_viewer->set_position (go_to.get().ceil(_film->video_frame_rate()));
+       if (go_to && Config::instance()->jump_to_selected() && signal_manager) {
+               signal_manager->when_idle(boost::bind(&FilmViewer::set_position, _film_viewer, go_to.get().ceil(_film->video_frame_rate())));
        }
 
        if (_timeline_dialog) {
@@ -523,6 +523,7 @@ ContentPanel::timeline_clicked ()
        }
 
        _timeline_dialog = new TimelineDialog (this, _film);
+       _timeline_dialog->set_selection (selected());
        _timeline_dialog->Show ();
 }