From: Carl Hetherington <cth@carlh.net>
Date: Sat, 20 Oct 2018 20:10:54 +0000 (+0100)
Subject: Don't set up new film several times when setting up new SPL in player.
X-Git-Tag: v2.13.65~16
X-Git-Url: https://git.carlh.net/gitweb/?a=commitdiff_plain;h=a1e52526e1d8252808228e0619968bfe2ee06be6;hp=a60b5f373fbc6a014a04ea40b8fd65eb75e09e0e;p=dcpomatic.git

Don't set up new film several times when setting up new SPL in player.
---

diff --git a/src/tools/dcpomatic_player.cc b/src/tools/dcpomatic_player.cc
index 237b769bb..a4333db82 100644
--- a/src/tools/dcpomatic_player.cc
+++ b/src/tools/dcpomatic_player.cc
@@ -500,14 +500,15 @@ public:
 				_film->set_three_d (true);
 			}
 
-			_viewer->set_film (_film);
-			_viewer->seek (DCPTime(), true);
-			_info->triggered_update ();
-
-			set_menu_sensitivity ();
 			_controls->log (wxString::Format(_("Load DCP %s"), i.directory.filename().string().c_str()));
 		}
 
+		_viewer->set_film (_film);
+		_viewer->seek (DCPTime(), true);
+		_info->triggered_update ();
+
+		set_menu_sensitivity ();
+
 		wxMenuItemList old = _cpl_menu->GetMenuItems();
 		for (wxMenuItemList::iterator i = old.begin(); i != old.end(); ++i) {
 			_cpl_menu->Remove (*i);