From: Carl Hetherington <cth@carlh.net>
Date: Mon, 17 Mar 2014 11:25:32 +0000 (+0000)
Subject: Merge master.
X-Git-Tag: v2.0.48~889
X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=1f8b45c7fd49714628009f5ed2161fbaa2b4d729

Merge master.
---

1f8b45c7fd49714628009f5ed2161fbaa2b4d729
diff --cc ChangeLog
index e70b7373e,5a99d30ff..2edfe0e12
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,9 +1,13 @@@
 +2014-03-07  Carl Hetherington  <cth@carlh.net>
 +
 +	* Add subtitle view.
 +
+ 2014-03-17  Carl Hetherington  <cth@carlh.net>
+ 
+ 	* Improve behaviour of the position slider at the end of films.
+ 
+ 	* Version 1.66.2 released.
+ 
  2014-03-17  Carl Hetherington  <cth@carlh.net>
  
  	* Improve appearance of config dialog on OS X.
diff --cc src/wx/film_viewer.cc
index 7e1b61811,ce5eab00e..b0bc65750
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@@ -221,14 -219,13 +221,19 @@@ voi
  FilmViewer::slider_moved ()
  {
  	if (_film && _player) {
 -		Time t = _slider->GetValue() * _film->length() / 4096;
 -		/* Ensure that we hit the end of the film at the end of the slider */
 -		if (t >= _film->length ()) {
 -			t = _film->length() - _film->video_frames_to_time (1);
 +		try {
++			Time t = _slider->GetValue() * _film->length() / 4096;
++			/* Ensure that we hit the end of the film at the end of the slider */
++			if (t >= _film->length ()) {
++				t = _film->length() - _film->video_frames_to_time (1);
++			}
 +			_player->seek (DCPTime (_film->length().get() * _slider->GetValue() / 4096), false);
 +			fetch_next_frame ();
 +		} catch (OpenFileError& e) {
 +			/* There was a problem opening a content file; we'll let this slide as it
 +			   probably means a missing content file, which we're already taking care of.
 +			*/
  		}
 -		_player->seek (t, false);
 -		fetch_next_frame ();
  	}
  }