X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fscreens_panel.cc;h=e45f036d29b600487943713a631eaf99672ecd80;hb=aa9d99923a11559e8a0bd320bc2bb13461033175;hp=5bdfe6c6ca061fc2f75f0ec33e9a05941626a6f4;hpb=d3aea06b37049ec0a10dbd926be4da731f9d59c9;p=dcpomatic.git

diff --git a/src/wx/screens_panel.cc b/src/wx/screens_panel.cc
index 5bdfe6c6c..e45f036d2 100644
--- a/src/wx/screens_panel.cc
+++ b/src/wx/screens_panel.cc
@@ -171,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);
 	}
@@ -188,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 ();
 	}
@@ -226,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);
 
@@ -244,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 ();
 	}
@@ -270,6 +271,8 @@ ScreensPanel::remove_screen_clicked ()
 		if (find (sc.begin(), sc.end(), s.second) != sc.end ()) {
 			break;
 		}
+
+		++i;
 	}
 
 	if (i == _cinemas.end()) {