diff options
| author | Carl Hetherington <cth@carlh.net> | 2020-09-27 20:07:06 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2020-09-27 20:07:06 +0200 |
| commit | 522298ca8eef0fd97045cda091f9c6576547f749 (patch) | |
| tree | 4d13a499ba10caf1949baf706113fbab55ce7d72 | |
| parent | cfef8499db2ddb5ba6f54b83e2b68c129745e00a (diff) | |
Use bitmap_path() method to find the splash screen image.
| -rw-r--r-- | src/wx/wx_util.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/wx/wx_util.cc b/src/wx/wx_util.cc index e90d2f848..758d57a80 100644 --- a/src/wx/wx_util.cc +++ b/src/wx/wx_util.cc @@ -473,8 +473,7 @@ maybe_show_splash () wxSplashScreen* splash = 0; try { wxBitmap bitmap; - boost::filesystem::path p = resources_path() / "splash.png"; - if (bitmap.LoadFile (std_to_wx (p.string ()), wxBITMAP_TYPE_PNG)) { + if (bitmap.LoadFile(bitmap_path("splash"), wxBITMAP_TYPE_PNG)) { splash = new wxSplashScreen (bitmap, wxSPLASH_CENTRE_ON_SCREEN | wxSPLASH_NO_TIMEOUT, 0, 0, -1); wxYield (); } @@ -578,7 +577,7 @@ bitmap_path (string name) boost::filesystem::path base; #ifdef DCPOMATIC_DEBUG - /* Hack to allow OS X to find icons when running from the source tree */ + /* Hack to allow Linux and OS X to find icons when running from the source tree */ char* path = getenv ("DCPOMATIC_GRAPHICS"); if (path) { base = path; |