diff options
| author | Carl Hetherington <cth@carlh.net> | 2024-06-28 13:04:30 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2024-06-28 13:04:30 +0200 |
| commit | d70f72ad7b25f5b71e8c27381e8bfdce6c0fa5b4 (patch) | |
| tree | 820d05ace03e08e140f7f31e84a893b5db04e15c /src/lib | |
| parent | 8b45384a7c9162d30309345ae863b4cab86aeda1 (diff) | |
| parent | 3dbe0b9ff88a16b938ad6adf2c26179e278fa712 (diff) | |
Merge remote-tracking branch 'origin/main' into v2.17.x
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/font_id_allocator.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/lib/font_id_allocator.cc b/src/lib/font_id_allocator.cc index 76b52e730..d5430e858 100644 --- a/src/lib/font_id_allocator.cc +++ b/src/lib/font_id_allocator.cc @@ -102,7 +102,9 @@ string FontIDAllocator::font_id(int reel_index, string asset_id, string font_id) const { auto iter = _map.find(Font(reel_index, asset_id, font_id)); - DCPOMATIC_ASSERT(iter != _map.end()); + if (iter == _map.end()) { + return default_font_id(); + } return iter->second; } |