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 4161aadc6..896445f0c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2017-05-03  Carl Hetherington  <cth@carlh.net>
+
+	* Version 2.11.3 released.
+
 2017-05-02  Carl Hetherington  <cth@carlh.net>
 
 	* Version 2.11.2 released.
diff --git a/debian/changelog b/debian/changelog
index 8a4a0ae90..d40f61cba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (2.11.2-1) UNRELEASED; urgency=low
+dcpomatic (2.11.3-1) UNRELEASED; urgency=low
 
   [ Carl Hetherington ]
   * New upstream release.
@@ -490,8 +490,9 @@ dcpomatic (2.11.2-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 17:01:08 +0100
+ -- Carl Hetherington <carl@main.carlh.net>  Wed, 03 May 2017 17:03:07 +0100
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low
 
diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index 83a179f26..3f6e7dacd 100644
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -456,7 +456,7 @@ FilmViewer::start ()
 	}
 
 	_playing = true;
-	_timer.Start (0, wxTIMER_ONE_SHOT);
+	_timer.Start (1.0, wxTIMER_ONE_SHOT);
 }
 
 bool
diff --git a/wscript b/wscript
index 92695c3cc..cffa06dc2 100644
--- a/wscript
+++ b/wscript
@@ -27,7 +27,7 @@ import distutils.spawn
 from waflib import Logs, Context
 
 APPNAME = 'dcpomatic'
-VERSION = '2.11.2devel'
+VERSION = '2.11.3devel'
 
 def options(opt):
     opt.load('compiler_cxx')