Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic

4 files changed, 9 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index f5eea27b2..4161aadc6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2017-05-02  Carl Hetherington  <cth@carlh.net>
 
+	* Version 2.11.2 released.
+
+2017-05-02  Carl Hetherington  <cth@carlh.net>
+
 	* Version 2.11.1 released.
 
 2017-04-30  Carl Hetherington  <cth@carlh.net>
diff --git a/debian/changelog b/debian/changelog
index 6a5c3a88f..8a4a0ae90 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (2.11.1-1) UNRELEASED; urgency=low
+dcpomatic (2.11.2-1) UNRELEASED; urgency=low
 
   [ Carl Hetherington ]
   * New upstream release.
@@ -489,8 +489,9 @@ dcpomatic (2.11.1-1) UNRELEASED; urgency=low
   * New upstream release.
   * New upstream release.
   * New upstream release.
+  * New upstream release.
 
- -- Carl Hetherington <carl@main.carlh.net>  Tue, 02 May 2017 00:49:35 +0100
+ -- Carl Hetherington <carl@main.carlh.net>  Tue, 02 May 2017 17:01:08 +0100
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low
 
diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index a0cc25ab9..83a179f26 100644
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -325,7 +325,7 @@ FilmViewer::timer ()
 		stop ();
 	}
 
-	_timer.Start (max ((next.seconds() - time().seconds()) * 1000, 0.0), wxTIMER_ONE_SHOT);
+	_timer.Start (max ((next.seconds() - time().seconds()) * 1000, 1.0), wxTIMER_ONE_SHOT);
 
 	if (_butler) {
 		_butler->rethrow ();
diff --git a/wscript b/wscript
index d1ebadaad..92695c3cc 100644
--- a/wscript
+++ b/wscript
@@ -27,7 +27,7 @@ import distutils.spawn
 from waflib import Logs, Context
 
 APPNAME = 'dcpomatic'
-VERSION = '2.11.1devel'
+VERSION = '2.11.2devel'
 
 def options(opt):
     opt.load('compiler_cxx')