diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-10-09 10:50:26 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-10-09 10:50:26 +0100 |
| commit | 5d398836a9b6acc2bbb536dabbd7bbc42a098659 (patch) | |
| tree | 7f613198c979212efb4e82a6f6250576a0edecef /src/tools | |
| parent | 568e553f506809e753c78a0e0cbad5906bc002b1 (diff) | |
| parent | 833d037185b37863d10adaa967c251038d9038e5 (diff) | |
Fix merge.
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/dcpomatic.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc index 86886ed9e..7646d5ebe 100644 --- a/src/tools/dcpomatic.cc +++ b/src/tools/dcpomatic.cc @@ -502,7 +502,7 @@ private: boost::filesystem::path zip_file = boost::filesystem::temp_directory_path (); zip_file /= boost::filesystem::unique_path().string() + ".zip"; - struct zip* zip = zip_open (zip_file.c_str(), ZIP_CREATE | ZIP_EXCL, 0); + struct zip* zip = zip_open (zip_file.string().c_str(), ZIP_CREATE | ZIP_EXCL, 0); if (!zip) { throw FileError ("could not create ZIP file", zip_file); } @@ -540,7 +540,7 @@ private: boost::algorithm::replace_all (body, "$DCP_NAME", film->dcp_name ()); quickmail_set_body (mail, body.c_str()); - quickmail_add_attachment_file (mail, zip_file.c_str()); + quickmail_add_attachment_file (mail, zip_file.string().c_str()); char const* error = quickmail_send (mail, Config::instance()->mail_server().c_str(), 25, "", ""); if (error) { quickmail_destroy (mail); |