summaryrefslogtreecommitdiff
path: root/src/lib/config.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2013-09-24 22:55:17 +0100
committerCarl Hetherington <cth@carlh.net>2013-09-24 22:55:17 +0100
commit07cab16dec83785163e09d668e10692cd8abed0d (patch)
treec094bc2f50ade809ccfaca9866f8c5058f240075 /src/lib/config.cc
parent089b90439e745a218494e76b45e7df6215af01df (diff)
Fix libdcp API changes; fix failure to reload cinema/screen configuration.
Diffstat (limited to 'src/lib/config.cc')
-rw-r--r--src/lib/config.cc7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/lib/config.cc b/src/lib/config.cc
index a72e1a9e4..9d2d9d1bf 100644
--- a/src/lib/config.cc
+++ b/src/lib/config.cc
@@ -132,7 +132,12 @@ Config::read ()
list<shared_ptr<cxml::Node> > cin = f.node_children ("Cinema");
for (list<shared_ptr<cxml::Node> >::iterator i = cin.begin(); i != cin.end(); ++i) {
- _cinemas.push_back (shared_ptr<Cinema> (new Cinema (*i)));
+ /* Slightly grotty two-part construction of Cinema here so that we can use
+ shared_from_this.
+ */
+ shared_ptr<Cinema> cinema (new Cinema (*i));
+ cinema->read_screens (*i);
+ _cinemas.push_back (cinema);
}
}