Rename player DCP directory to player content; ignore failures to load directories...

[dcpomatic.git] / src / wx / controls.cc

diff --git a/src/wx/controls.cc b/src/wx/controls.cc
index eb70726d014e1be6400c9cfbf8d33899ad2a6fb0..074aa82c2d1ad764ddcda972abbb86f76c51e788 100644 (file)
--- 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 */
                }
        }
 }