"boot" messages; more AU fixes; new SAE ui.conf file

git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@3049 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 24 insertions, 23 deletions

diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index b2a327c8c9..7c77a44194 100644
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -4371,39 +4371,40 @@ Editor::get_regions_for_action (RegionSelection& rs, bool allow_entered)
 				rs.add (entered_regionview);
 				return;
 			}
-		}
-	} else {
-		use_regions_at = false;
-	}
 
-	rs = selection->regions;
+		} else {
 
-	/* consider adding the entered regionview */
+			/* no regions selected, so get all regions at the edit point across
+			   all selected tracks. 
+			*/
 
-	if (allow_entered && entered_regionview && (mouse_mode == Editing::MouseObject)) {
-		
-		/* only add the entered regionview if its not selected OR
-		   (we're not going to use regions at edit point OR its track is not selected)
+			nframes64_t where = get_preferred_edit_position();
+			get_regions_at (rs, where, selection->tracks);
 
-		   this avoids duplicate regions ending up in "rs"
-		*/
+			/* if the entered regionview wasn't selected and neither was its track
+			   then add it.
+			*/
 
-		if (!selection->selected (entered_regionview) && 
-		    (!use_regions_at || !selection->selected (&entered_regionview->get_time_axis_view()))) {
-			rs.add (entered_regionview);
+			if (!selection->selected (entered_regionview) && 
+			    !selection->selected (&entered_regionview->get_time_axis_view())) {
+				rs.add (entered_regionview);
+			}
 		}
-	}
 
-	if (use_regions_at) {
+	} else {
+		
+		/* just use the selected regions */
+
+		rs = selection->regions;
 
-		/* nothing selected, so get all regions at the edit point across
-		   all selected tracks
+		/* if the entered regionview wasn't selected and we allow this sort of thing,
+		   then add it.
 		*/
-		
-		if (!selection->tracks.empty()) {
-			nframes64_t where = get_preferred_edit_position();
-			get_regions_at (rs, where, selection->tracks);
+
+		if (allow_entered && entered_regionview && !selection->selected (entered_regionview)) {
+			rs.add (entered_regionview);
 		}
+
 	}
 }