Fix hang when removing screens.

diff --git a/ChangeLog b/ChangeLog
index af26051b21617695260176250e52b6a81d50fbe0..560f09ef100049db8e17602d11e4f0127a2b3d81 100644 (file)
--- 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 3328fe61eb137cd4232076f0ed941de2c98cb68b..e45f036d29b600487943713a631eaf99672ecd80 100644 (file)
--- 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()) {