more NSD madness curing; fix up canvas range rects and marker line height mgmt

git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@2902 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2008-01-12 03:56:43 +00:00
parent 11faee3307
commit 51c333a7b3
7 changed files with 82 additions and 50 deletions

View file

@ -571,9 +571,11 @@ NewSessionDialog::set_session_folder(const Glib::ustring& dir)
#else
if (!Glib::file_test (dir, Glib::FILE_TEST_IS_DIR)) {
realdir = Glib::path_get_dirname (realdir);
cerr << "didn't exist, use " << realdir << endl;
}
if ((res = canonicalize_file_name (realdir.c_str())) != 0) {
cerr << "canonical, use " << res << endl;
m_folder->set_current_folder (res);
free (res);
}
@ -623,6 +625,13 @@ NewSessionDialog::session_folder() const
case NewPage:
return Glib::filename_from_utf8(m_folder->get_filename());
case EnginePage:
if (page_set == EnginePage) {
/* just engine page, nothing else : use m_folder since it should be set */
return Glib::filename_from_utf8(m_folder->get_filename());
}
break;
default:
break;
}