summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2014-03-31 14:11:57 +0100
committerCarl Hetherington <cth@carlh.net>2014-03-31 14:11:57 +0100
commit666825da92cba00cd70efbeb2a032d5dfe79caaf (patch)
tree259f1a574ed0b8b92bc7725196ed47b041191b77
parent8f9c5e06afd3c0255ed484a495b1ddad7fd83205 (diff)
Fix remove screen button.
-rw-r--r--src/wx/kdm_dialog.cc8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/wx/kdm_dialog.cc b/src/wx/kdm_dialog.cc
index 295287f42..0336d0cb7 100644
--- a/src/wx/kdm_dialog.cc
+++ b/src/wx/kdm_dialog.cc
@@ -354,9 +354,11 @@ KDMDialog::remove_screen_clicked ()
pair<wxTreeItemId, shared_ptr<Screen> > s = selected_screens().front();
map<wxTreeItemId, shared_ptr<Cinema> >::iterator i = _cinemas.begin ();
- list<shared_ptr<Screen> > sc = i->second->screens ();
- while (i != _cinemas.end() && find (sc.begin(), sc.end(), s.second) == sc.end()) {
- ++i;
+ while (i != _cinemas.end ()) {
+ list<shared_ptr<Screen> > sc = i->second->screens ();
+ if (find (sc.begin(), sc.end(), s.second) != sc.end ()) {
+ break;
+ }
}
if (i == _cinemas.end()) {