update CycleTimer to utilize NDEBUG and PBD::DEBUG so that we can leave them in place...

[ardour.git] / gtk2_ardour / option_editor.cc

diff --git a/gtk2_ardour/option_editor.cc b/gtk2_ardour/option_editor.cc
index acb8551960495c3ff995c03f8311b884ef38557b..dcae19ef77b6c1fcbfcf1693119182159908e98f 100644 (file)
--- a/gtk2_ardour/option_editor.cc
+++ b/gtk2_ardour/option_editor.cc
@@ -326,13 +326,14 @@ DirectoryOption::DirectoryOption (string const & i, string const & n, sigc::slot
 {
        _file_chooser.set_action (Gtk::FILE_CHOOSER_ACTION_SELECT_FOLDER);
        _file_chooser.signal_file_set().connect (sigc::mem_fun (*this, &DirectoryOption::file_set));
+       _file_chooser.signal_current_folder_changed().connect (sigc::mem_fun (*this, &DirectoryOption::current_folder_set));
 }
 
 
 void
 DirectoryOption::set_state_from_config ()
 {
-       _file_chooser.set_filename (_get ());
+       _file_chooser.set_current_folder (_get ());
 }
 
 void
@@ -346,3 +347,9 @@ DirectoryOption::file_set ()
 {
        _set (_file_chooser.get_filename ());
 }
+
+void
+DirectoryOption::current_folder_set ()
+{
+       _set (_file_chooser.get_current_folder ());
+}