X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fscreen_dialog.cc;h=5f676bda7a3c5ddf2025870c2ac3c8b6ccbf2201;hb=edab06d1ccc37662c5f0c75efada11771f69a435;hp=503745683980f3b2a860ec09050c2b80bba01a84;hpb=b6c780d3107557d452c6612d715d01e2be52dbda;p=dcpomatic.git

diff --git a/src/wx/screen_dialog.cc b/src/wx/screen_dialog.cc
index 503745683..5f676bda7 100644
--- a/src/wx/screen_dialog.cc
+++ b/src/wx/screen_dialog.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -44,7 +44,7 @@ ScreenDialog::ScreenDialog (wxWindow* parent, string title, string name, optiona
 	add (_("Certificate"), true);
 	wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
 	_load_certificate = new wxButton (this, wxID_ANY, _("Load from file..."));
-	_download_certificate = new wxButton (this, wxID_ANY, _("Download"));
+	_download_certificate = new wxButton (this, wxID_ANY, _("Download..."));
 	s->Add (_load_certificate, 1, wxEXPAND);
 	s->Add (_download_certificate, 1, wxEXPAND);
 	add (s);
@@ -128,7 +128,9 @@ void
 ScreenDialog::setup_sensitivity ()
 {
 	wxButton* ok = dynamic_cast<wxButton*> (FindWindowById (wxID_OK, this));
-	ok->Enable (_certificate);
+	if (ok) {
+		ok->Enable (_certificate);
+	}
 
 	_download_certificate->Enable (
 		_manufacturer->GetStringSelection() == _("Doremi") ||