diff options
| author | Carl Hetherington <cth@carlh.net> | 2018-10-19 23:16:53 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2018-10-19 23:16:53 +0100 |
| commit | 541e55115e8dfb09bb584f8176698d1db6ff826a (patch) | |
| tree | 954a1786ddad7fee55b1f6bafeeb733a68eb7a1e /src/wx/controls.cc | |
| parent | 9c44c5fa8eaf00ef4e61c08273b8df55047ac082 (diff) | |
Rename player DCP directory to player content; ignore failures to load directories which are not DCPs from the player content directory.
Diffstat (limited to 'src/wx/controls.cc')
| -rw-r--r-- | src/wx/controls.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/wx/controls.cc b/src/wx/controls.cc index eb70726d0..074aa82c2 100644 --- a/src/wx/controls.cc +++ b/src/wx/controls.cc @@ -245,7 +245,7 @@ Controls::load_clicked () void Controls::config_changed (int property) { - if (property == Config::PLAYER_DCP_DIRECTORY) { + if (property == Config::PLAYER_CONTENT_DIRECTORY) { update_dcp_directory (); } else { setup_sensitivity (); @@ -615,7 +615,7 @@ Controls::update_dcp_directory () _cpl->DeleteAllItems (); _cpls.clear (); - optional<path> dir = Config::instance()->player_dcp_directory(); + optional<path> dir = Config::instance()->player_content_directory(); if (!dir) { return; } @@ -633,6 +633,8 @@ Controls::update_dcp_directory () } } catch (boost::filesystem::filesystem_error& e) { /* Never mind */ + } catch (dcp::DCPReadError& e) { + /* Never mind */ } } } |