Always show splash even if we already have a config.xml.
authorCarl Hetherington <cth@carlh.net>
Fri, 1 Feb 2019 22:19:37 +0000 (22:19 +0000)
committerCarl Hetherington <cth@carlh.net>
Fri, 1 Feb 2019 22:19:37 +0000 (22:19 +0000)
src/wx/wx_util.cc

index 354297d49549f17d522b9771482775db75beb879..f77cfacd374aaea6330cce2fc807ee17237496c2 100644 (file)
@@ -455,13 +455,11 @@ maybe_show_splash ()
 {
        wxSplashScreen* splash = 0;
        try {
 {
        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 */
                }
        } catch (boost::filesystem::filesystem_error& e) {
                /* Maybe we couldn't find the splash image; never mind */