Fix hang when removing screens.

[dcpomatic.git] / src / wx / screens_panel.cc

diff --git a/src/wx/screens_panel.cc b/src/wx/screens_panel.cc
index ce5f2555e308a8cd6d2e75ade7cf11dc95fbdd8a..e45f036d29b600487943713a631eaf99672ecd80 100644 (file)
--- a/src/wx/screens_panel.cc
+++ b/src/wx/screens_panel.cc
@@ -27,6 +27,7 @@
 
 using std::list;
 using std::pair;
+using std::cout;
 using std::map;
 using std::make_pair;
 using boost::shared_ptr;
@@ -69,7 +70,7 @@ ScreensPanel::ScreensPanel (wxWindow* parent)
 
        sizer->Add (targets, 1, wxEXPAND);
 
-       _targets->Bind       (wxEVT_COMMAND_TREE_SEL_CHANGED, boost::bind (&ScreensPanel::selection_changed, this));
+       _targets->Bind       (wxEVT_COMMAND_TREE_SEL_CHANGED, &ScreensPanel::selection_changed, this);
 
        _add_cinema->Bind    (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&ScreensPanel::add_cinema_clicked, this));
        _edit_cinema->Bind   (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&ScreensPanel::edit_cinema_clicked, this));
@@ -82,6 +83,11 @@ ScreensPanel::ScreensPanel (wxWindow* parent)
        SetSizer (sizer);
 }
 
+ScreensPanel::~ScreensPanel ()
+{
+       _targets->Unbind (wxEVT_COMMAND_TREE_SEL_CHANGED, &ScreensPanel::selection_changed, this);
+}
+
 list<pair<wxTreeItemId, shared_ptr<Cinema> > >
 ScreensPanel::selected_cinemas () const
 {
@@ -140,6 +146,8 @@ ScreensPanel::add_cinema (shared_ptr<Cinema> c)
        for (list<shared_ptr<Screen> >::iterator i = sc.begin(); i != sc.end(); ++i) {
                add_screen (c, *i);
        }
+
+       _targets->SortChildren (_root);
 }
 
 void
@@ -163,7 +171,7 @@ ScreensPanel::add_cinema_clicked ()
 {
        CinemaDialog* d = new CinemaDialog (this, "Add Cinema");
        if (d->ShowModal () == wxID_OK) {
-               shared_ptr<Cinema> c (new Cinema (d->name(), d->email()));
+               shared_ptr<Cinema> c (new Cinema (d->name(), d->emails()));
                Config::instance()->add_cinema (c);
                add_cinema (c);
        }
@@ -180,10 +188,10 @@ ScreensPanel::edit_cinema_clicked ()
 
        pair<wxTreeItemId, shared_ptr<Cinema> > c = selected_cinemas().front();
 
-       CinemaDialog* d = new CinemaDialog (this, "Edit cinema", c.second->name, c.second->email);
+       CinemaDialog* d = new CinemaDialog (this, "Edit cinema", c.second->name, c.second->emails);
        if (d->ShowModal () == wxID_OK) {
                c.second->name = d->name ();
-               c.second->email = d->email ();
+               c.second->emails = d->emails ();
                _targets->SetItemText (c.first, std_to_wx (d->name()));
                Config::instance()->changed ();
        }
@@ -218,7 +226,7 @@ ScreensPanel::add_screen_clicked ()
                return;
        }
 
-       shared_ptr<Screen> s (new Screen (d->name(), d->certificate()));
+       shared_ptr<Screen> s (new Screen (d->name(), d->recipient(), d->trusted_devices()));
        c->add_screen (s);
        add_screen (c, s);
 
@@ -236,10 +244,11 @@ ScreensPanel::edit_screen_clicked ()
 
        pair<wxTreeItemId, shared_ptr<Screen> > s = selected_screens().front();
 
-       ScreenDialog* d = new ScreenDialog (this, "Edit screen", s.second->name, s.second->certificate);
+       ScreenDialog* d = new ScreenDialog (this, "Edit screen", s.second->name, s.second->recipient, s.second->trusted_devices);
        if (d->ShowModal () == wxID_OK) {
                s.second->name = d->name ();
-               s.second->certificate = d->certificate ();
+               s.second->recipient = d->recipient ();
+               s.second->trusted_devices = d->trusted_devices ();
                _targets->SetItemText (s.first, std_to_wx (d->name()));
                Config::instance()->changed ();
        }
@@ -262,6 +271,8 @@ ScreensPanel::remove_screen_clicked ()
                if (find (sc.begin(), sc.end(), s.second) != sc.end ()) {
                        break;
                }
+
+               ++i;
        }
 
        if (i == _cinemas.end()) {
@@ -299,7 +310,7 @@ ScreensPanel::screens () const
 }
 
 void
-ScreensPanel::selection_changed ()
+ScreensPanel::selection_changed (wxTreeEvent &)
 {
        setup_sensitivity ();
        ScreensChanged ();