From: Carl Hetherington <cth@carlh.net>
Date: Thu, 17 Nov 2016 01:28:27 +0000 (+0000)
Subject: Prevent duplicate screen names within a cinema (#1007).
X-Git-Tag: v2.10.3-test~35
X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=3bc7c343d4e13a2d0498ae92dbc99b292f5ea322

Prevent duplicate screen names within a cinema (#1007).
---

diff --git a/ChangeLog b/ChangeLog
index 3a3a5f5a0..efd31871f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2016-11-17  Carl Hetherington  <cth@carlh.net>
+
+	* Prevent duplicate screen names within a cinema (#1007).
+
 2016-11-16  Carl Hetherington  <cth@carlh.net>
 
 	* Version 2.10.1 released.
diff --git a/src/wx/screens_panel.cc b/src/wx/screens_panel.cc
index 664363264..3fabba46a 100644
--- a/src/wx/screens_panel.cc
+++ b/src/wx/screens_panel.cc
@@ -205,9 +205,23 @@ ScreensPanel::add_screen_clicked ()
 
 	ScreenDialog* d = new ScreenDialog (GetParent(), _("Add Screen"));
 	if (d->ShowModal () != wxID_OK) {
+		d->Destroy ();
 		return;
 	}
 
+	BOOST_FOREACH (shared_ptr<Screen> i, c->screens ()) {
+		if (i->name == d->name()) {
+			error_dialog (
+				GetParent(),
+				wxString::Format (
+					_("You cannot add a screen called '%s' as the cinema already has a screen with this name."),
+					std_to_wx(d->name()).data()
+					)
+				);
+			return;
+		}
+	}
+
 	shared_ptr<Screen> s (new Screen (d->name(), d->recipient(), d->trusted_devices()));
 	c->add_screen (s);
 	optional<wxTreeItemId> id = add_screen (c, s);
@@ -230,15 +244,32 @@ ScreensPanel::edit_screen_clicked ()
 	pair<wxTreeItemId, shared_ptr<Screen> > s = *_selected_screens.begin();
 
 	ScreenDialog* d = new ScreenDialog (GetParent(), _("Edit screen"), s.second->name, s.second->notes, s.second->recipient, s.second->trusted_devices);
-	if (d->ShowModal () == wxID_OK) {
-		s.second->name = d->name ();
-		s.second->notes = d->notes ();
-		s.second->recipient = d->recipient ();
-		s.second->trusted_devices = d->trusted_devices ();
-		_targets->SetItemText (s.first, std_to_wx (d->name()));
-		Config::instance()->changed ();
+	if (d->ShowModal () != wxID_OK) {
+		d->Destroy ();
+		return;
 	}
 
+	shared_ptr<Cinema> c = s.second->cinema;
+	BOOST_FOREACH (shared_ptr<Screen> i, c->screens ()) {
+		if (i != s.second && i->name == d->name()) {
+			error_dialog (
+				GetParent(),
+				wxString::Format (
+					_("You cannot change this screen's name to '%s' as the cinema already has a screen with this name."),
+					std_to_wx(d->name()).data()
+					)
+				);
+			return;
+		}
+	}
+
+	s.second->name = d->name ();
+	s.second->notes = d->notes ();
+	s.second->recipient = d->recipient ();
+	s.second->trusted_devices = d->trusted_devices ();
+	_targets->SetItemText (s.first, std_to_wx (d->name()));
+	Config::instance()->changed ();
+
 	d->Destroy ();
 }