From: Carl Hetherington <cth@carlh.net>
Date: Tue, 22 Dec 2015 21:04:15 +0000 (+0000)
Subject: Fix hang when removing screens.
X-Git-Tag: v2.6.9~4
X-Git-Url: https://git.carlh.net/gitweb/?a=commitdiff_plain;ds=sidebyside;h=aa9d99923a11559e8a0bd320bc2bb13461033175;hp=be8675cc978fbd52817943e88ea40b81f8a4c9c4;p=dcpomatic.git

Fix hang when removing screens.
---

diff --git a/ChangeLog b/ChangeLog
index af26051b2..560f09ef1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2015-12-22  Carl Hetherington  <cth@carlh.net>
+
+	* Fix hang when removing screens in some cases.
+
 2015-12-21  Carl Hetherington  <cth@carlh.net>
 
 	* Version 2.6.8 released.
diff --git a/src/wx/screens_panel.cc b/src/wx/screens_panel.cc
index 3328fe61e..e45f036d2 100644
--- a/src/wx/screens_panel.cc
+++ b/src/wx/screens_panel.cc
@@ -271,6 +271,8 @@ ScreensPanel::remove_screen_clicked ()
 		if (find (sc.begin(), sc.end(), s.second) != sc.end ()) {
 			break;
 		}
+
+		++i;
 	}
 
 	if (i == _cinemas.end()) {