Merge branch 'ardour'

gtk2_ardour/editor_sections.cc

@@ -264,6 +264,10 @@ EditorSections::selection_changed ()
 		return;
 	}
 
+	if (PublicEditor::instance ().drag_active ()) {
+		return;
+	}
+
 	TreeView::Selection::ListHandle_Path rows = _view.get_selection ()->get_selected_rows ();
 	if (rows.empty ()) {
 		return;

gtk2_ardour/luainstance.cc

@@ -35,6 +35,7 @@
 #include "ardour/filesystem_paths.h"
 #include "ardour/plugin_manager.h"
 #include "ardour/route.h"
+#include "ardour/search_paths.h"
 #include "ardour/session.h"
 #include "ardour/system_exec.h"
 
@@ -1208,11 +1209,16 @@ LuaInstance::~LuaInstance ()
 }
 
 static std::string
-lua_read_script (std::string const& fn)
+lua_read_script (std::string fn)
 {
 	if (!UIConfiguration::instance().get_update_action_scripts ()) {
 		return "";
 	}
+
+	if (Glib::path_is_absolute (fn) && !Glib::file_test (fn, Glib::FILE_TEST_EXISTS | Glib::FILE_TEST_IS_REGULAR)) {
+		PBD::find_file (lua_search_path (), Glib::path_get_basename (fn), fn);
+	}
+
 	try {
 		return Glib::file_get_contents (fn);
 	} catch (...) { }

libs/ardour/session_midi.cc

@@ -764,6 +764,10 @@ Session::disconnect_port_for_rewire (std::string const& port) const
 void
 Session::rewire_selected_midi (std::shared_ptr<MidiTrack> new_midi_target)
 {
+	if (actively_recording()) {
+		return;
+	}
+
 	if (!new_midi_target) {
 		return;
 	}
@@ -806,6 +810,10 @@ Session::rewire_selected_midi (std::shared_ptr<MidiTrack> new_midi_target)
 void
 Session::rewire_midi_selection_ports ()
 {
+	if (actively_recording()) {
+		return;
+	}
+
 	if (!Config->get_midi_input_follows_selection()) {
 		return;
 	}

libs/widgets/barcontroller.cc

@@ -87,7 +87,7 @@ BarController::on_button_press_event (GdkEventButton* ev)
 	} else {
 		_switch_on_release = false;
 	}
-	return false;
+	return 1 == ev->button;
 }
 
 bool