}
name_values['s'] = i.screen->name;
- string const name = name_format.get(name_values) + ".xml";
+ string const name = name_format.get(name_values, ".xml");
if (zip_add (zip, name.c_str(), source) == -1) {
throw runtime_error ("failed to add KDM to ZIP archive");
}
BOOST_FOREACH (CinemaKDMs const & i, cinema_kdms) {
boost::filesystem::path path = directory;
name_values['c'] = i.cinema->name;
- path /= name_format.get(name_values) + ".zip";
+ path /= name_format.get(name_values, ".zip");
i.make_zip_file (path, name_format, name_values);
}
}
email.add_bcc (config->kdm_bcc ());
}
- email.add_attachment (zip_file, name_format.get(name_values) + ".zip", "application/zip");
+ email.add_attachment (zip_file, name_format.get(name_values, ".zip"), "application/zip");
Config* c = Config::instance ();