diff options
| author | Carl Hetherington <cth@carlh.net> | 2026-02-21 01:19:33 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2026-02-21 01:19:33 +0100 |
| commit | 6e5d26b0e2fac85bfccaae2d3d7b767f2037758c (patch) | |
| tree | b857e3a06f60d7cacb15f109edb6277dad749afb | |
| parent | 791c8b584d8d408c30e1c5fa6ff9c00685650687 (diff) | |
Stop some "old metadata" fixes when using development versions.
| -rw-r--r-- | src/lib/check_content_job.cc | 2 | ||||
| -rw-r--r-- | src/lib/film.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/check_content_job.cc b/src/lib/check_content_job.cc index 98e8c7989..5e9db4d6d 100644 --- a/src/lib/check_content_job.cc +++ b/src/lib/check_content_job.cc @@ -86,7 +86,7 @@ CheckContentJob::run() set_message(_("Some files have been changed since they were added to the project.\n\nThese files will now be re-examined, so you may need to check their settings.")); } - if (_film->last_written_by_earlier_than(2, 18, 30)) { + if (!_film->last_written_by_git() && _film->last_written_by_earlier_than(2, 18, 30)) { std::vector<shared_ptr<Content>> needs_upgrade; std::copy_if(content.begin(), content.end(), std::back_inserter(needs_upgrade), [](shared_ptr<Content> c) { return static_cast<bool>(dynamic_pointer_cast<FFmpegContent>(c)); }); if (!needs_upgrade.empty()) { diff --git a/src/lib/film.cc b/src/lib/film.cc index 3af1a5e18..b0276086a 100644 --- a/src/lib/film.cc +++ b/src/lib/film.cc @@ -772,7 +772,7 @@ Film::read_metadata(optional<boost::filesystem::path> path) * Before 2.18.26 we wrote IDs which might now fail. In 2.18.30 we added this check, to mistrust * any existing IDs and to re-create them. */ - if (last_written_by_earlier_than(2, 18, 30)) { + if (!last_written_by_git() && last_written_by_earlier_than(2, 18, 30)) { for (auto content: _playlist->content()) { if (auto ffmpeg = dynamic_pointer_cast<FFmpegContent>(content)) { ffmpeg->remove_stream_ids(); |