Fix hang when removing screens.

2 files changed, 6 insertions, 0 deletions

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()) {