diff options
| author | Carl Hetherington <cth@carlh.net> | 2019-02-01 22:19:37 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2019-02-01 22:19:37 +0000 |
| commit | 878267e97858c00714de3074ed81ebd92d52b146 (patch) | |
| tree | 0a822b1c9c8ad52555e5ec8b71aa9581179d5fa8 /src | |
| parent | 38a1363ec4adfd0c8de48ec44ae21a5184ca8317 (diff) | |
Always show splash even if we already have a config.xml.
Diffstat (limited to 'src')
| -rw-r--r-- | src/wx/wx_util.cc | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/wx/wx_util.cc b/src/wx/wx_util.cc index 354297d49..f77cfacd3 100644 --- a/src/wx/wx_util.cc +++ b/src/wx/wx_util.cc @@ -455,13 +455,11 @@ maybe_show_splash () { 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 (); - } + 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 */ |