diff options
| author | Carl Hetherington <cth@carlh.net> | 2018-01-05 18:57:48 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2018-01-05 18:57:48 +0000 |
| commit | 660d365faf784a8ea80d5fdc21a1384e81153194 (patch) | |
| tree | a1727830dd12d47f96fac813f4bbdc114a6d572d /src/tools/dcpomatic.cc | |
| parent | a34e100c7e8f7bce98cf074ecb0507fe6175df61 (diff) | |
Make player/KDM creator and main DCP-o-matic all behave the same with respect to problems when loading config.
Diffstat (limited to 'src/tools/dcpomatic.cc')
| -rw-r--r-- | src/tools/dcpomatic.cc | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc index a0dde813d..90c70abc2 100644 --- a/src/tools/dcpomatic.cc +++ b/src/tools/dcpomatic.cc @@ -1177,19 +1177,7 @@ private: Config::FailedToLoad.connect (boost::bind (&App::config_failed_to_load, this)); Config::Warning.connect (boost::bind (&App::config_warning, this, _1)); - wxSplashScreen* splash = 0; - try { - if (!Config::have_existing ("config.xml")) { - wxBitmap bitmap; - boost::filesystem::path p = shared_path () / "splash.png"; - if (bitmap.LoadFile (std_to_wx (p.string ()), wxBITMAP_TYPE_PNG)) { - splash = new wxSplashScreen (bitmap, wxSPLASH_CENTRE_ON_SCREEN | wxSPLASH_NO_TIMEOUT, 0, 0, -1); - wxYield (); - } - } - } catch (boost::filesystem::filesystem_error& e) { - /* Maybe we couldn't find the splash image; never mind */ - } + wxSplashScreen* splash = maybe_show_splash (); SetAppName (_("DCP-o-matic")); |
