Use plain git hash for VERSION when there is no exact tag.

[dcpomatic.git] / src / lib / cinema.cc

diff --git a/src/lib/cinema.cc b/src/lib/cinema.cc
index 7e13b50aea775ef4900b637e145913aa742c92a8..3b4b9d7b615aa1a7116f4acb221abd3658fe41da 100644 (file)
--- a/src/lib/cinema.cc
+++ b/src/lib/cinema.cc
@@ -25,13 +25,11 @@
 #include <libcxml/cxml.h>
 #include <dcp/raw_convert.h>
 #include <libxml++/libxml++.h>
-#include <iostream>
 
 
-using std::list;
-using std::string;
-using std::shared_ptr;
 using std::make_shared;
+using std::shared_ptr;
+using std::string;
 using dcp::raw_convert;
 using dcpomatic::Screen;
 
@@ -93,7 +91,10 @@ Cinema::add_screen (shared_ptr<Screen> s)
 void
 Cinema::remove_screen (shared_ptr<Screen> s)
 {
-       _screens.remove (s);
+       auto iter = std::find(_screens.begin(), _screens.end(), s);
+       if (iter != _screens.end()) {
+               _screens.erase(iter);
+       }
 }
 
 void