projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Give a better error if the user tries to load a non-KDM as a DKDM into the KDM creator.
[dcpomatic.git]
/
src
/
wx
/
config_dialog.cc
diff --git
a/src/wx/config_dialog.cc
b/src/wx/config_dialog.cc
index ac5d90296b0982a26f6fedc26c498ca63927f684..5b7dc1cc41390e5f63406c201857e0b8f5d7ce08 100644
(file)
--- a/
src/wx/config_dialog.cc
+++ b/
src/wx/config_dialog.cc
@@
-624,7
+624,6
@@
private:
columns,
boost::bind (&Config::servers, Config::instance()),
boost::bind (&Config::set_servers, Config::instance(), _1),
columns,
boost::bind (&Config::servers, Config::instance()),
boost::bind (&Config::set_servers, Config::instance(), _1),
- boost::bind (&always_valid),
boost::bind (&EncodingServersPage::server_column, this, _1)
);
boost::bind (&EncodingServersPage::server_column, this, _1)
);
@@
-773,8
+772,9
@@
private:
if (d->ShowModal() == wxID_OK) {
try {
if (d->ShowModal() == wxID_OK) {
try {
- dcp::Certificate c (dcp::file_to_string (wx_to_std (d->GetPath ())));
- if (c.extra_data ()) {
+ dcp::Certificate c;
+ string const extra = c.read_string (dcp::file_to_string (wx_to_std (d->GetPath ())));
+ if (!extra.empty ()) {
message_dialog (
this,
_("This file contains other certificates (or other data) after its first certificate. "
message_dialog (
this,
_("This file contains other certificates (or other data) after its first certificate. "
@@
-1275,7
+1275,6
@@
private:
columns,
bind (&Config::kdm_cc, Config::instance()),
bind (&Config::set_kdm_cc, Config::instance(), _1),
columns,
bind (&Config::kdm_cc, Config::instance()),
bind (&Config::set_kdm_cc, Config::instance(), _1),
- bind (&string_not_empty, _1),
bind (&column, _1)
);
table->Add (_kdm_cc, 1, wxEXPAND | wxALL);
bind (&column, _1)
);
table->Add (_kdm_cc, 1, wxEXPAND | wxALL);