summaryrefslogtreecommitdiff
path: root/src/tools
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2022-04-28 22:12:54 +0200
committerCarl Hetherington <cth@carlh.net>2022-04-29 23:37:48 +0200
commit54141c7a9504e289d41af997067ca6b78a1d4b0a (patch)
tree4f792d29c6d090837be267362334151b23f00399 /src/tools
parentaff13422649363d7fed58287958ca66b363825ba (diff)
Fix (I think) some strange situations where ::get() on dialogs
used by EditableList would return something that wasn't a optional<> but would then get implicitly cast to one. Now we have a static_assert to check that the type is what we expect.
Diffstat (limited to 'src/tools')
-rw-r--r--src/tools/dcpomatic_combiner.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/tools/dcpomatic_combiner.cc b/src/tools/dcpomatic_combiner.cc
index 40587e23a..4532b0429 100644
--- a/src/tools/dcpomatic_combiner.cc
+++ b/src/tools/dcpomatic_combiner.cc
@@ -65,7 +65,7 @@ public:
}
- boost::filesystem::path get () const
+ optional<boost::filesystem::path> get () const
{
return boost::filesystem::path(wx_to_std(GetPath()));
}