X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic_combiner.cc;h=4532b04299981c35297d97d5b3bee0dbc1ef83eb;hb=54141c7a9504e289d41af997067ca6b78a1d4b0a;hp=4a783d6346f65679d289a29035199b7401c24bc4;hpb=a7ad0cdff67faffc6bdaef21c100d4ef4016e406;p=dcpomatic.git

diff --git a/src/tools/dcpomatic_combiner.cc b/src/tools/dcpomatic_combiner.cc
index 4a783d634..4532b0429 100644
--- a/src/tools/dcpomatic_combiner.cc
+++ b/src/tools/dcpomatic_combiner.cc
@@ -28,9 +28,9 @@
 #include "lib/job_manager.h"
 #include "lib/util.h"
 #include <dcp/combine.h>
-DCPOMATIC_DISABLE_WARNINGS
+LIBDCP_DISABLE_WARNINGS
 #include <wx/filepicker.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <wx/wx.h>
 #include <boost/bind/bind.hpp>
 #include <boost/filesystem.hpp>
@@ -65,7 +65,7 @@ public:
 
 	}
 
-	boost::filesystem::path get () const
+	optional<boost::filesystem::path> get () const
 	{
 		return boost::filesystem::path(wx_to_std(GetPath()));
 	}