diff options
| author | Carl Hetherington <cth@carlh.net> | 2018-07-23 15:10:11 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2018-07-23 15:10:11 +0100 |
| commit | a5c629cb9b638b67a0e4c2d26fe9ab2e124bf0eb (patch) | |
| tree | 6cd463704f413259516e2888704272a371a108a6 /src/tools/dcpomatic.cc | |
| parent | df17bbd25da69fc38eb2dcd8b4a2531cf0bab0bc (diff) | |
Tidy up after mass rename.
Diffstat (limited to 'src/tools/dcpomatic.cc')
| -rw-r--r-- | src/tools/dcpomatic.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc index a2b55691e..a97e12b69 100644 --- a/src/tools/dcpomatic.cc +++ b/src/tools/dcpomatic.cc @@ -567,7 +567,7 @@ private: { DCPOMATIC_ASSERT (_clipboard); - PasteDialog* d = new PasteDialog (this, static_cast<bool>(_clipboard->video), static_cast<bool>(_clipboard->audio), !_clipboard->caption.empty()); + PasteDialog* d = new PasteDialog (this, static_cast<bool>(_clipboard->video), static_cast<bool>(_clipboard->audio), !_clipboard->text.empty()); if (d->ShowModal() == wxID_OK) { BOOST_FOREACH (shared_ptr<Content> i, _film_editor->content_panel()->selected()) { if (d->video() && i->video) { @@ -579,10 +579,10 @@ private: i->audio->take_settings_from (_clipboard->audio); } - if (d->caption()) { - list<shared_ptr<TextContent> >::iterator j = i->caption.begin (); - list<shared_ptr<TextContent> >::const_iterator k = _clipboard->caption.begin (); - while (j != i->caption.end() && k != _clipboard->caption.end()) { + if (d->text()) { + list<shared_ptr<TextContent> >::iterator j = i->text.begin (); + list<shared_ptr<TextContent> >::const_iterator k = _clipboard->text.begin (); + while (j != i->text.end() && k != _clipboard->text.end()) { (*j)->take_settings_from (*k); ++j; ++k; |
