Validation of certificate chains will fail before dcpomatic_setup()

[dcpomatic.git] / src / tools / dcpomatic.cc

diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc
index 7cac8e7f0ce30156364efd0ed3f67920f71410ac..508390a38986dce5161aaab445ddb925c26df55c 100644 (file)
--- a/src/tools/dcpomatic.cc
+++ b/src/tools/dcpomatic.cc
@@ -1506,15 +1506,16 @@ private:
                        */
                        Config::drop ();
 
+                       /* We only look out for bad configuration from here on, as before
+                          dcpomatic_setup() we haven't got OpenSSL ready so there will be
+                          incorrect certificate chain validity errors.
+                       */
                        Config::Bad.connect (boost::bind(&App::config_bad, this, _1));
 
                        _frame = new DOMFrame (_("DCP-o-matic"));
                        SetTopWindow (_frame);
                        _frame->Maximize ();
-                       if (_splash) {
-                               _splash->Destroy ();
-                               _splash = 0;
-                       }
+                       close_splash ();
 
                        if (!Config::instance()->nagged(Config::NAG_INITIAL_SETUP)) {
                                InitialSetupDialog* d = new InitialSetupDialog ();
@@ -1650,13 +1651,23 @@ private:
                }
        }
 
+       void close_splash ()
+       {
+               if (_splash) {
+                       _splash->Destroy ();
+                       _splash = 0;
+               }
+       }
+
        void config_failed_to_load ()
        {
+               close_splash ();
                message_dialog (_frame, _("The existing configuration failed to load.  Default values will be used instead.  These may take a short time to create."));
        }
 
        void config_warning (string m)
        {
+               close_splash ();
                message_dialog (_frame, std_to_wx (m));
        }