From 429ff2547b2652a86d32799fbab9b83ceaeb5cdd Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Tue, 9 Nov 2010 23:50:20 +0000 Subject: missing dialog cleanups and logic improvements git-svn-id: svn://localhost/ardour2/branches/3.0@7990 d708f5d6-7413-0410-9779-e7cbd77b26cf --- libs/ardour/file_source.cc | 6 +++--- libs/ardour/session.cc | 4 ++++ 2 files changed, 7 insertions(+), 3 deletions(-) (limited to 'libs') diff --git a/libs/ardour/file_source.cc b/libs/ardour/file_source.cc index 264d6482b4..84d4f3043f 100644 --- a/libs/ardour/file_source.cc +++ b/libs/ardour/file_source.cc @@ -103,13 +103,13 @@ FileSource::init (const string& pathstr, bool must_exist) } } - set_within_session_from_path (pathstr); + set_within_session_from_path (_path); if (!within_session()) { - _session.ensure_search_path_includes (Glib::path_get_dirname (pathstr), _type); + _session.ensure_search_path_includes (Glib::path_get_dirname (_path), _type); } - _name = Glib::path_get_basename (pathstr); + _name = Glib::path_get_basename (_path); if (_file_is_new && must_exist) { return -1; diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc index 7bc9b1ad12..bbdfefccb7 100644 --- a/libs/ardour/session.cc +++ b/libs/ardour/session.cc @@ -4141,6 +4141,10 @@ Session::ensure_search_path_includes (const string& path, DataType type) string search_path; vector dirs; + if (path == ".") { + return; + } + switch (type) { case DataType::AUDIO: search_path = config.get_audio_search_path (); -- cgit v1.2.3