diff --git a/src/wx/wxvbam.cpp b/src/wx/wxvbam.cpp index 09e1e8c3..1fa90314 100644 --- a/src/wx/wxvbam.cpp +++ b/src/wx/wxvbam.cpp @@ -97,16 +97,15 @@ bool wxvbamApp::OnInit() xr->Load(wxT("*.xrs")); } - if (wxSetWorkingDirectory(wxStandardPaths::Get().GetPluginsDir() + wxT("\\xrc"))) { - if (!wxFindFirstFile(wxT("*.xrc")).empty()) - xr->Load(wxT("*.xrc")); + wxString xrcDir = wxStandardPaths::Get().GetPluginsDir() + wxT("\\xrc"); + if (wxDirExists(xrcDir) && wxSetWorkingDirectory(xrcDir) && !wxFindFirstFile(wxT("*.xrc")).empty()) { + xr->Load(wxT("*.xrc")); } else { // finally, load built-in xrc xr->Load(wxT("memory:wxvbam.xrs")); } - wxSetWorkingDirectory(cwd); // set up config file