diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-09-22 16:30:01 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-09-22 16:30:01 +0100 |
| commit | d462bce261da5836b8ee8703ef8c4807f50a5586 (patch) | |
| tree | 2ce5d8d07c521d5a21d27fc5015b210b17c026a1 /src/wx | |
| parent | c798eb7009a429e51abedd90292c6ec62d4b32b5 (diff) | |
| parent | 87344ac176a9bf04129a5c31e879852bb5280b37 (diff) | |
Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
Diffstat (limited to 'src/wx')
| -rw-r--r-- | src/wx/content_panel.cc | 2 | ||||
| -rw-r--r-- | src/wx/job_view.cc | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/wx/content_panel.cc b/src/wx/content_panel.cc index 1d9f010bf..5892d9c4c 100644 --- a/src/wx/content_panel.cc +++ b/src/wx/content_panel.cc @@ -468,7 +468,7 @@ ContentPanel::set_selection (weak_ptr<Content> wc) void ContentPanel::film_content_changed (int property) { - if (property == ContentProperty::PATH || property == DCPContentProperty::CAN_BE_PLAYED) { + if (property == ContentProperty::PATH || property == DCPContentProperty::NEEDS_ASSETS || property == DCPContentProperty::NEEDS_KDM) { setup (); } diff --git a/src/wx/job_view.cc b/src/wx/job_view.cc index 8718d14e3..136b18ed3 100644 --- a/src/wx/job_view.cc +++ b/src/wx/job_view.cc @@ -121,7 +121,9 @@ JobView::details_clicked (wxCommandEvent &) void JobView::cancel_clicked (wxCommandEvent &) { - _job->cancel (); + if (confirm_dialog (_parent, _("Are you sure you want to cancel this job?"))) { + _job->cancel (); + } } void |