Merge master.
[dcpomatic.git] / src / wx / timeline.cc
index 13baef6b7bb0c143021aeb67a97fe7dcc714127e..556e6f1b3e08ca44c2108c27cd001a4cb02c2c29 100644 (file)
@@ -715,7 +715,7 @@ Timeline::set_position_from_event (wxMouseEvent& ev)
                                DCPTime const d = DCPTime (cv->content()->end() - new_position).abs ();
                                if (first || d < nearest_distance) {
                                        nearest_distance = d;
-                                       nearest_new_position = cv->content()->end();
+                                       nearest_new_position = cv->content()->end() + DCPTime::delta ();
                                }
                        }
                        
@@ -727,7 +727,7 @@ Timeline::set_position_from_event (wxMouseEvent& ev)
                                
                                if (d < nearest_distance) {
                                        nearest_distance = d;
-                                       nearest_new_position = cv->content()->position() - _down_view->content()->length_after_trim ();
+                                       nearest_new_position = cv->content()->position() - _down_view->content()->length_after_trim () - DCPTime::delta();
                                }
                        }