X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fwx%2Fdownload_certificate_panel.cc;h=6c01b0d3f257da5ce529aaa8a0a0377c54116814;hb=89b190d60c85e0bcdc9882a97f8fbe59e2a19c3d;hp=7b670261b89d53219c9744d72d46a669d4e7be04;hpb=1a14ae26a73489ae8990bfda1a432d229c3bb2d5;p=dcpomatic.git diff --git a/src/wx/download_certificate_panel.cc b/src/wx/download_certificate_panel.cc index 7b670261b..6c01b0d3f 100644 --- a/src/wx/download_certificate_panel.cc +++ b/src/wx/download_certificate_panel.cc @@ -1,19 +1,20 @@ /* Copyright (C) 2014-2015 Carl Hetherington - This program is free software; you can redistribute it and/or modify + This file is part of DCP-o-matic. + + DCP-o-matic is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, + DCP-o-matic is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with DCP-o-matic. If not, see . */ @@ -24,6 +25,7 @@ #include using boost::function; +using boost::optional; DownloadCertificatePanel::DownloadCertificatePanel (wxWindow* parent, DownloadCertificateDialog* dialog) : wxPanel (parent, wxID_ANY) @@ -55,9 +57,8 @@ DownloadCertificatePanel::load (boost::filesystem::path file) } } -dcp::Certificate +optional DownloadCertificatePanel::certificate () const { - DCPOMATIC_ASSERT (_certificate); - return _certificate.get (); + return _certificate; }