Use a better pattern to avoid abort_reversible_command().

	- also, duplicated regoins are now selected and some end-of sesion
	  bugs fixed there.
	- should fix lack of tempomap undo in Editor::insert_time ()

1 files changed, 288 insertions, 141 deletions

diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc
index 41b7bcc8eb..14c6f91237 100644
--- a/gtk2_ardour/editor_ops.cc
+++ b/gtk2_ardour/editor_ops.cc
@@ -400,8 +400,7 @@ Editor::nudge_forward (bool next, bool force_playhead)
 	} else if (!force_playhead && !selection->markers.empty()) {
 
 		bool is_start;
-
-		begin_reversible_command (_("nudge location forward"));
+		bool in_command = false;
 
 		for (MarkerSelection::iterator i = selection->markers.begin(); i != selection->markers.end(); ++i) {
 
@@ -432,13 +431,18 @@ Editor::nudge_forward (bool next, bool force_playhead)
 						loc->set_end (max_framepos);
 					}
 				}
+				if (!in_command) {
+					begin_reversible_command (_("nudge location forward"));
+					in_command = true;
+				}
 				XMLNode& after (loc->get_state());
 				_session->add_command (new MementoCommand<Location>(*loc, &before, &after));
 			}
 		}
 
-		commit_reversible_command ();
-
+		if (in_command) {
+			commit_reversible_command ();
+		}
 	} else {
 		distance = get_nudge_distance (playhead_cursor->current_frame (), next_distance);
 		_session->request_locate (playhead_cursor->current_frame () + distance);
@@ -485,8 +489,7 @@ Editor::nudge_backward (bool next, bool force_playhead)
 	} else if (!force_playhead && !selection->markers.empty()) {
 
 		bool is_start;
-
-		begin_reversible_command (_("nudge location forward"));
+		bool in_command = false;
 
 		for (MarkerSelection::iterator i = selection->markers.begin(); i != selection->markers.end(); ++i) {
 
@@ -519,13 +522,17 @@ Editor::nudge_backward (bool next, bool force_playhead)
 						loc->set_end (loc->length());
 					}
 				}
-
+				if (!in_command) {
+					begin_reversible_command (_("nudge location forward"));
+					in_command = true;
+				}
 				XMLNode& after (loc->get_state());
 				_session->add_command (new MementoCommand<Location>(*loc, &before, &after));
 			}
 		}
-
-		commit_reversible_command ();
+		if (in_command) {
+			commit_reversible_command ();
+		}
 
 	} else {
 
@@ -615,7 +622,8 @@ Editor::sequence_regions ()
 
 	if (!rs.empty()) {
 
-		begin_reversible_command (_("sequence regions"));
+		bool in_command = false;
+
 		for (RegionSelection::iterator i = rs.begin(); i != rs.end(); ++i) {
 			boost::shared_ptr<Region> r ((*i)->region());
 
@@ -635,13 +643,20 @@ Editor::sequence_regions ()
 				r->set_position(r_end_prev);
 			}
 
+			if (!in_command) {
+				begin_reversible_command (_("sequence regions"));
+				in_command = true;
+			}
 			_session->add_command (new StatefulDiffCommand (r));
 
 			r_end=r->position() + r->length();
 
 			iCount++;
 		}
-		commit_reversible_command ();
+
+		if (in_command) {
+			commit_reversible_command ();
+		}
 	} 
 } 
 
@@ -2191,7 +2206,6 @@ Editor::remove_location_at_playhead_cursor ()
 			begin_reversible_command (_("remove marker"));
 			XMLNode &after = _session->locations()->get_state();
 			_session->add_command(new MementoCommand<Locations>(*(_session->locations()), &before, &after));
-			
 			commit_reversible_command ();
 		}
 	}
@@ -2206,8 +2220,7 @@ Editor::add_locations_from_region ()
 	if (rs.empty()) {
 		return;
 	}
-
-	begin_reversible_command (selection->regions.size () > 1 ? _("add markers") : _("add marker"));
+	bool commit = false;
 	
 	XMLNode &before = _session->locations()->get_state();
 
@@ -2218,12 +2231,15 @@ Editor::add_locations_from_region ()
 		Location *location = new Location (*_session, region->position(), region->last_frame(), region->name(), Location::IsRangeMarker);
 
 		_session->locations()->add (location, true);
+		commit = true;
 	}
 
-	XMLNode &after = _session->locations()->get_state();
-	_session->add_command (new MementoCommand<Locations>(*(_session->locations()), &before, &after));
-	
-	commit_reversible_command ();
+	if (commit) {
+		begin_reversible_command (selection->regions.size () > 1 ? _("add markers") : _("add marker"));
+		XMLNode &after = _session->locations()->get_state();
+		_session->add_command (new MementoCommand<Locations>(*(_session->locations()), &before, &after));
+		commit_reversible_command ();
+	}
 }
 
 /** Add a single range marker around all selected regions */
@@ -2252,14 +2268,13 @@ Editor::add_location_from_region ()
 		return;
 	}
 
-	begin_reversible_command (_("add marker"));
 	// single range spanning all selected
 	Location *location = new Location (*_session, selection->regions.start(), selection->regions.end_frame(), markername, Location::IsRangeMarker);
 	_session->locations()->add (location, true);
 
+	begin_reversible_command (_("add marker"));
 	XMLNode &after = _session->locations()->get_state();
 	_session->add_command (new MementoCommand<Locations>(*(_session->locations()), &before, &after));
-	
 	commit_reversible_command ();
 }
 
@@ -3261,8 +3276,7 @@ Editor::crop_region_to (framepos_t start, framepos_t end)
 	framepos_t the_start;
 	framepos_t the_end;
 	framepos_t cnt;
-
-	begin_reversible_command (_("trim to selection"));
+	bool in_command = false;
 
 	for (vector<boost::shared_ptr<Playlist> >::iterator i = playlists.begin(); i != playlists.end(); ++i) {
 
@@ -3287,27 +3301,32 @@ Editor::crop_region_to (framepos_t start, framepos_t end)
 		the_end = min (end, the_end);
 		cnt = the_end - the_start + 1;
 
+		if(!in_command) {
+			begin_reversible_command (_("trim to selection"));
+			in_command = true;
+		}
 		region->clear_changes ();
 		region->trim_to (the_start, cnt);
 		_session->add_command (new StatefulDiffCommand (region));
 	}
 
-	commit_reversible_command ();
+	if (in_command) {
+		commit_reversible_command ();
+	}
 }
 
 void
 Editor::region_fill_track ()
 {
 	RegionSelection rs = get_regions_from_selection_and_entered ();
-	bool commit = false;
 
 	if (!_session || rs.empty()) {
 		return;
 	}
 
 	framepos_t const end = _session->current_end_frame ();
-
-	begin_reversible_command (Operations::region_fill);
+	RegionSelection foo;
+	bool in_command = false;
 
 	for (RegionSelection::iterator i = rs.begin(); i != rs.end(); ++i) {
 
@@ -3316,26 +3335,38 @@ Editor::region_fill_track ()
 		boost::shared_ptr<Playlist> pl = region->playlist();
 
 		if (end <= region->last_frame()) {
-			goto out;
+			continue;
 		}
 
 		double times = (double) (end - region->last_frame()) / (double) region->length();
 
 		if (times == 0) {
-			goto out;
+			continue;
+		}
+
+		if (!in_command) {
+			begin_reversible_command (Operations::region_fill);
+			in_command = true;
 		}
+		TimeAxisView& tv = (*i)->get_time_axis_view();
+		RouteTimeAxisView* rtv = dynamic_cast<RouteTimeAxisView*> (&tv);
+		latest_regionviews.clear ();
+		sigc::connection c = rtv->view()->RegionViewAdded.connect (sigc::mem_fun(*this, &Editor::collect_new_region_view));
 
 		pl->clear_changes ();
 		pl->add_region (RegionFactory::create (region, true), region->last_frame(), times);
 		_session->add_command (new StatefulDiffCommand (pl));
-		commit = true;
+
+		c.disconnect ();
+
+		foo.insert (foo.end(), latest_regionviews.begin(), latest_regionviews.end());
 	}
 
-out:
-	if (commit) {
+	if (in_command) {
+		if (!foo.empty()) {
+			selection->set (foo);
+		}
 		commit_reversible_command ();
-	} else {
-		abort_reversible_command ();
 	}
 }
 
@@ -3366,11 +3397,10 @@ Editor::region_fill_selection ()
 
 	framepos_t selection_length = end - start;
 	float times = (float)selection_length / region->length();
-	bool commit = false;
-
-	begin_reversible_command (Operations::fill_selection);
+	bool in_command = false;
 
 	TrackViewList ts = selection->tracks.filter_to_unique_playlists ();
+	RegionSelection foo;
 
 	for (TrackViewList::iterator i = ts.begin(); i != ts.end(); ++i) {
 
@@ -3378,16 +3408,26 @@ Editor::region_fill_selection ()
 			continue;
 		}
 
+		if (!in_command) {
+			begin_reversible_command (Operations::fill_selection);
+			in_command = true;
+		}
+		RouteTimeAxisView* rtv = dynamic_cast<RouteTimeAxisView*> (*i);
+		latest_regionviews.clear ();
+		sigc::connection c = rtv->view()->RegionViewAdded.connect (sigc::mem_fun(*this, &Editor::collect_new_region_view));
+
 		playlist->clear_changes ();
 		playlist->add_region (RegionFactory::create (region, true), start, times);
 		_session->add_command (new StatefulDiffCommand (playlist));
-		commit = true;
+		c.disconnect ();
+		foo.insert (foo.end(), latest_regionviews.begin(), latest_regionviews.end());
 	}
 
-	if (commit) {
+	if (in_command) {
+		if (!foo.empty()) {
+			selection->set (foo);
+		}
 		commit_reversible_command ();
-	} else {
-		abort_reversible_command ();
 	}
 }
 
@@ -3686,8 +3726,7 @@ void
 Editor::trim_region_to_location (const Location& loc, const char* str)
 {
 	RegionSelection rs = get_regions_from_selection_and_entered ();
-
-	begin_reversible_command (str);
+	bool in_command = false;
 
 	for (RegionSelection::iterator x = rs.begin(); x != rs.end(); ++x) {
 		RegionView* rv = (*x);
@@ -3718,10 +3757,17 @@ Editor::trim_region_to_location (const Location& loc, const char* str)
 
 		rv->region()->clear_changes ();
 		rv->region()->trim_to (start, (end - start));
+
+		if (!in_command) {
+			begin_reversible_command (str);
+			in_command = true;
+		}
 		_session->add_command(new StatefulDiffCommand (rv->region()));
 	}
 
-	commit_reversible_command ();
+	if (in_command) {
+		commit_reversible_command ();
+	}
 }
 
 void
@@ -3740,8 +3786,7 @@ void
 Editor::trim_to_region(bool forward)
 {
 	RegionSelection rs = get_regions_from_selection_and_entered ();
-	bool commit = false;
-	begin_reversible_command (_("trim to region"));
+	bool in_command = false;
 
 	boost::shared_ptr<Region> next_region;
 
@@ -3795,14 +3840,15 @@ Editor::trim_to_region(bool forward)
 		    arv->region_changed (ARDOUR::bounds_change);
 		}
 
+		if (!in_command) {
+			begin_reversible_command (_("trim to region"));
+			in_command = true;
+		}
 		_session->add_command(new StatefulDiffCommand (region));
-		commit = true;
 	}
 
-	if (commit) {
+	if (in_command) {
 		commit_reversible_command ();
-	} else {
-		abort_reversible_command ();
 	}
 }
 
@@ -3928,8 +3974,7 @@ Editor::bounce_range_selection (bool replace, bool enable_processing)
 	framepos_t start = selection->time[clicked_selection].start;
 	framepos_t end = selection->time[clicked_selection].end;
 	framepos_t cnt = end - start + 1;
-
-	begin_reversible_command (_("bounce range"));
+	bool in_command = false;
 
 	for (TrackViewList::iterator i = views.begin(); i != views.end(); ++i) {
 
@@ -3969,6 +4014,10 @@ Editor::bounce_range_selection (bool replace, bool enable_processing)
 			playlist->add_region (r, start);
 		}
 
+		if (!in_command) {
+			begin_reversible_command (_("bounce range"));
+			in_command = true;
+		}
 		vector<Command*> cmds;
 		playlist->rdiff (cmds);
 		_session->add_commands (cmds);
@@ -3976,7 +4025,9 @@ Editor::bounce_range_selection (bool replace, bool enable_processing)
 		_session->add_command (new StatefulDiffCommand (playlist));
 	}
 
-	commit_reversible_command ();
+	if (in_command) {
+		commit_reversible_command ();
+	}
 }
 
 /** Delete selected regions, automation points or a time range */
@@ -4330,8 +4381,6 @@ Editor::remove_selected_regions ()
 		return;
 	}
 
-	begin_reversible_command (_("remove region"));
-
 	list<boost::shared_ptr<Region> > regions_to_remove;
 
 	for (RegionSelection::iterator i = rs.begin(); i != rs.end(); ++i) {
@@ -4375,6 +4424,7 @@ Editor::remove_selected_regions ()
 	}
 
 	vector<boost::shared_ptr<Playlist> >::iterator pl;
+	bool in_command = false;
 
 	for (pl = playlists.begin(); pl != playlists.end(); ++pl) {
 		(*pl)->thaw ();
@@ -4382,6 +4432,11 @@ Editor::remove_selected_regions ()
 		/* We might have removed regions, which alters other regions' layering_index,
 		   so we need to do a recursive diff here.
 		*/
+
+		if (!in_command) {
+			begin_reversible_command (_("remove region"));
+			in_command = true;
+		}
 		vector<Command*> cmds;
 		(*pl)->rdiff (cmds);
 		_session->add_commands (cmds);
@@ -4389,7 +4444,9 @@ Editor::remove_selected_regions ()
 		_session->add_command(new StatefulDiffCommand (*pl));
 	}
 
-	commit_reversible_command ();
+	if (in_command) {
+		commit_reversible_command ();
+	}
 }
 
 /** Cut, copy or clear selected regions.
@@ -4725,6 +4782,10 @@ Editor::paste_internal (framepos_t position, float times)
 void
 Editor::duplicate_some_regions (RegionSelection& regions, float times)
 {
+	if (regions.empty ()) {
+		return;
+	}
+
 	boost::shared_ptr<Playlist> playlist;
 	RegionSelection sel = regions; // clear (below) may  clear the argument list if its the current region selection
 	RegionSelection foo;
@@ -4779,11 +4840,10 @@ Editor::duplicate_selection (float times)
 		return;
 	}
 
-	begin_reversible_command (_("duplicate selection"));
-
 	ri = new_regions.begin();
 
 	TrackViewList ts = selection->tracks.filter_to_unique_playlists ();
+	bool in_command = false;
 
 	for (TrackViewList::iterator i = ts.begin(); i != ts.end(); ++i) {
 		if ((playlist = (*i)->playlist()) == 0) {
@@ -4797,6 +4857,11 @@ Editor::duplicate_selection (float times)
 			end = selection->time.end_frame();
 		}
 		playlist->duplicate (*ri, end, times);
+
+		if (!in_command) {
+			begin_reversible_command (_("duplicate selection"));
+			in_command = true;
+		}
 		_session->add_command (new StatefulDiffCommand (playlist));
 
 		++ri;
@@ -4805,7 +4870,9 @@ Editor::duplicate_selection (float times)
 		}
 	}
 
-	commit_reversible_command ();
+	if (in_command) {
+		commit_reversible_command ();
+	}
 }
 
 /** Reset all selected points to the relevant default value */
@@ -4863,9 +4930,8 @@ Editor::nudge_track (bool use_edit, bool forwards)
 		return;
 	}
 
-	begin_reversible_command (_("nudge track"));
-
 	TrackViewList ts = selection->tracks.filter_to_unique_playlists ();
+	bool in_command = false;
 
 	for (TrackViewList::iterator i = ts.begin(); i != ts.end(); ++i) {
 
@@ -4878,6 +4944,10 @@ Editor::nudge_track (bool use_edit, bool forwards)
 
 		playlist->nudge_after (start, distance, forwards);
 
+		if (!in_command) {
+			begin_reversible_command (_("nudge track"));
+			in_command = true;
+		}
 		vector<Command*> cmds;
 
 		playlist->rdiff (cmds);
@@ -4886,7 +4956,9 @@ Editor::nudge_track (bool use_edit, bool forwards)
 		_session->add_command (new StatefulDiffCommand (playlist));
 	}
 
-	commit_reversible_command ();
+	if (in_command) {
+		commit_reversible_command ();
+	}
 }
 
 void
@@ -4966,9 +5038,8 @@ Editor::normalize_region ()
 		}
 	}
 
-	begin_reversible_command (_("normalize"));
-
 	list<double>::const_iterator a = max_amps.begin ();
+	bool in_command = false;
 
 	for (RegionSelection::iterator r = rs.begin(); r != rs.end(); ++r) {
 		AudioRegionView* const arv = dynamic_cast<AudioRegionView*> (*r);
@@ -4981,12 +5052,19 @@ Editor::normalize_region ()
 		double const amp = dialog.normalize_individually() ? *a : max_amp;
 
 		arv->audio_region()->normalize (amp, dialog.target ());
+
+		if (!in_command) {
+			begin_reversible_command (_("normalize"));
+			in_command = true;
+		}
 		_session->add_command (new StatefulDiffCommand (arv->region()));
 
 		++a;
 	}
 
-	commit_reversible_command ();
+	if (in_command) {
+		commit_reversible_command ();
+	}
 }
 
 
@@ -5003,7 +5081,7 @@ Editor::reset_region_scale_amplitude ()
 		return;
 	}
 
-	begin_reversible_command ("reset gain");
+	bool in_command = false;
 
 	for (RegionSelection::iterator r = rs.begin(); r != rs.end(); ++r) {
 		AudioRegionView* const arv = dynamic_cast<AudioRegionView*>(*r);
@@ -5011,10 +5089,17 @@ Editor::reset_region_scale_amplitude ()
 			continue;
 		arv->region()->clear_changes ();
 		arv->audio_region()->set_scale_amplitude (1.0f);
+
+		if(!in_command) {
+				begin_reversible_command ("reset gain");
+				in_command = true;
+		}
 		_session->add_command (new StatefulDiffCommand (arv->region()));
 	}
 
-	commit_reversible_command ();
+	if (in_command) {
+		commit_reversible_command ();
+	}
 }
 
 void
@@ -5026,7 +5111,7 @@ Editor::adjust_region_gain (bool up)
 		return;
 	}
 
-	begin_reversible_command ("adjust region gain");
+	bool in_command = false;
 
 	for (RegionSelection::iterator r = rs.begin(); r != rs.end(); ++r) {
 		AudioRegionView* const arv = dynamic_cast<AudioRegionView*>(*r);
@@ -5045,10 +5130,17 @@ Editor::adjust_region_gain (bool up)
 		}
 
 		arv->audio_region()->set_scale_amplitude (dB_to_coefficient (dB));
+
+		if (!in_command) {
+				begin_reversible_command ("adjust region gain");
+				in_command = true;
+		}
 		_session->add_command (new StatefulDiffCommand (arv->region()));
 	}
 
-	commit_reversible_command ();
+	if (in_command) {
+		commit_reversible_command ();
+	}
 }
 
 
@@ -5120,7 +5212,7 @@ Editor::apply_midi_note_edit_op (MidiOperator& op, const RegionSelection& rs)
 		return;
 	}
 
-	begin_reversible_command (op.name ());
+	bool in_command = false;
 
 	for (RegionSelection::const_iterator r = rs.begin(); r != rs.end(); ) {
 		RegionSelection::const_iterator tmp = r;
@@ -5131,6 +5223,10 @@ Editor::apply_midi_note_edit_op (MidiOperator& op, const RegionSelection& rs)
 		if (mrv) {
 			Command* cmd = apply_midi_note_edit_op_to_region (op, *mrv);
 			if (cmd) {
+				if (!in_command) {
+					begin_reversible_command (op.name ());
+					in_command = true;
+				}
 				(*cmd)();
 				_session->add_command (cmd);
 			}
@@ -5139,7 +5235,9 @@ Editor::apply_midi_note_edit_op (MidiOperator& op, const RegionSelection& rs)
 		r = tmp;
 	}
 
-	commit_reversible_command ();
+	if (in_command) {
+		commit_reversible_command ();
+	}
 }
 
 void
@@ -5151,9 +5249,9 @@ Editor::fork_region ()
 		return;
 	}
 
-	begin_reversible_command (_("Fork Region(s)"));
-
 	CursorContext::Handle cursor_ctx = CursorContext::create(*this, _cursors->wait);
+	bool in_command = false;
+
 	gdk_flush ();
 
 	for (RegionSelection::iterator r = rs.begin(); r != rs.end(); ) {
@@ -5167,7 +5265,11 @@ Editor::fork_region ()
 				boost::shared_ptr<Playlist> playlist = mrv->region()->playlist();
 				boost::shared_ptr<MidiSource> new_source = _session->create_midi_source_by_stealing_name (mrv->midi_view()->track());
 				boost::shared_ptr<MidiRegion> newregion = mrv->midi_region()->clone (new_source);
-				
+
+				if (!in_command) {
+					begin_reversible_command (_("Fork Region(s)"));
+					in_command = true;
+				}
 				playlist->clear_changes ();
 				playlist->replace_region (mrv->region(), newregion, mrv->region()->position());
 				_session->add_command(new StatefulDiffCommand (playlist));
@@ -5179,7 +5281,9 @@ Editor::fork_region ()
 		r = tmp;
 	}
 
-	commit_reversible_command ();
+	if (in_command) {
+		commit_reversible_command ();
+	}
 }
 
 void
@@ -5296,15 +5400,14 @@ void
 Editor::apply_filter (Filter& filter, string command, ProgressReporter* progress)
 {
 	RegionSelection rs = get_regions_from_selection_and_entered ();
-	bool commit = false;
 
 	if (rs.empty()) {
 		return;
 	}
 
-	begin_reversible_command (command);
-
 	CursorContext::Handle cursor_ctx = CursorContext::create(*this, _cursors->wait);
+	bool in_command = false;
+
 	gdk_flush ();
 
 	int n = 0;
@@ -5350,14 +5453,19 @@ Editor::apply_filter (Filter& filter, string command, ProgressReporter* progress
 				/* We might have removed regions, which alters other regions' layering_index,
 				   so we need to do a recursive diff here.
 				*/
+
+				if (!in_command) {
+					begin_reversible_command (command);
+					in_command = true;
+				}
 				vector<Command*> cmds;
 				playlist->rdiff (cmds);
 				_session->add_commands (cmds);
 				
 				_session->add_command(new StatefulDiffCommand (playlist));
-				commit = true;
+
 			} else {
-				goto out;
+				continue;
 			}
 
 			if (progress) {
@@ -5368,11 +5476,9 @@ Editor::apply_filter (Filter& filter, string command, ProgressReporter* progress
 		r = tmp;
 		++n;
 	}
-out:
-	if (commit) {
+
+	if (in_command) {
 		commit_reversible_command ();
-	} else {
-		abort_reversible_command ();
 	}
 }
 
@@ -5391,7 +5497,7 @@ Editor::reset_region_gain_envelopes ()
 		return;
 	}
 
-	begin_reversible_command (_("reset region gain"));
+	bool in_command = false;
 	
 	for (RegionSelection::iterator i = rs.begin(); i != rs.end(); ++i) {
 		AudioRegionView* const arv = dynamic_cast<AudioRegionView*>(*i);
@@ -5400,11 +5506,18 @@ Editor::reset_region_gain_envelopes ()
 			XMLNode& before (alist->get_state());
 
 			arv->audio_region()->set_default_envelope ();
+
+			if (!in_command) {
+				begin_reversible_command (_("reset region gain"));
+				in_command = true;
+			}
 			_session->add_command (new MementoCommand<AutomationList>(*arv->audio_region()->envelope().get(), &before, &alist->get_state()));
 		}
 	}
-	
-	commit_reversible_command ();
+
+	if (in_command) {
+		commit_reversible_command ();
+	}
 }
 
 void
@@ -5444,18 +5557,25 @@ Editor::toggle_gain_envelope_active ()
 		return;
 	}
 
-	begin_reversible_command (_("region gain envelope active"));
-	
+	bool in_command = false;
+
 	for (RegionSelection::iterator i = rs.begin(); i != rs.end(); ++i) {
 		AudioRegionView* const arv = dynamic_cast<AudioRegionView*>(*i);
 		if (arv) {
 			arv->region()->clear_changes ();
 			arv->audio_region()->set_envelope_active (!arv->audio_region()->envelope_active());
+
+			if (!in_command) {
+				begin_reversible_command (_("region gain envelope active"));
+				in_command = true;
+			}
 			_session->add_command (new StatefulDiffCommand (arv->region()));
 		}
 	}
-	
-	commit_reversible_command ();
+
+	if (in_command) {
+		commit_reversible_command ();
+	}
 }
 
 void
@@ -5663,7 +5783,6 @@ Editor::set_fade_length (bool in)
 	framepos_t pos = get_preferred_edit_position();
 	framepos_t len;
 	char const * cmd;
-	bool commit = false;
 
 	if (pos > rv->region()->last_frame() || pos < rv->region()->first_frame()) {
 		/* edit point is outside the relevant region */
@@ -5686,7 +5805,7 @@ Editor::set_fade_length (bool in)
 		cmd = _("set fade out length");
 	}
 
-	begin_reversible_command (cmd);
+	bool in_command = false;
 
 	for (RegionSelection::iterator x = rs.begin(); x != rs.end(); ++x) {
 		AudioRegionView* tmp = dynamic_cast<AudioRegionView*> (*x);
@@ -5711,15 +5830,17 @@ Editor::set_fade_length (bool in)
 			tmp->audio_region()->set_fade_out_length (len);
 			tmp->audio_region()->set_fade_out_active (true);
 		}
+
+		if (!in_command) {
+			begin_reversible_command (cmd);
+			in_command = true;
+		}
 		XMLNode &after = alist->get_state();
 		_session->add_command(new MementoCommand<AutomationList>(*alist, &before, &after));
-		commit = true;
 	}
 
-	if (commit) {
+	if (in_command) {
 		commit_reversible_command ();
-	} else {
-		abort_reversible_command ();
 	}
 }
 
@@ -5731,8 +5852,7 @@ Editor::set_fade_in_shape (FadeShape shape)
 	if (rs.empty()) {
 		return;
 	}
-	bool commit = false;
-	begin_reversible_command (_("set fade in shape"));
+	bool in_command = false;
 
 	for (RegionSelection::iterator x = rs.begin(); x != rs.end(); ++x) {
 		AudioRegionView* tmp = dynamic_cast<AudioRegionView*> (*x);
@@ -5746,15 +5866,16 @@ Editor::set_fade_in_shape (FadeShape shape)
 
 		tmp->audio_region()->set_fade_in_shape (shape);
 
+		if (!in_command) {
+			begin_reversible_command (_("set fade in shape"));
+			in_command = true;
+		}
 		XMLNode &after = alist->get_state();
 		_session->add_command(new MementoCommand<AutomationList>(*alist.get(), &before, &after));
-		commit = true;
 	}
 
-	if (commit) {
+	if (in_command) {
 		commit_reversible_command ();
-	} else {
-		abort_reversible_command ();
 	}
 }
 
@@ -5766,8 +5887,7 @@ Editor::set_fade_out_shape (FadeShape shape)
 	if (rs.empty()) {
 		return;
 	}
-	bool commit = false;
-	begin_reversible_command (_("set fade out shape"));
+	bool in_command = false;
 
 	for (RegionSelection::iterator x = rs.begin(); x != rs.end(); ++x) {
 		AudioRegionView* tmp = dynamic_cast<AudioRegionView*> (*x);
@@ -5781,15 +5901,16 @@ Editor::set_fade_out_shape (FadeShape shape)
 
 		tmp->audio_region()->set_fade_out_shape (shape);
 
+		if(!in_command) {
+			begin_reversible_command (_("set fade out shape"));
+			in_command = true;
+		}
 		XMLNode &after = alist->get_state();
 		_session->add_command(new MementoCommand<AutomationList>(*alist.get(), &before, &after));
-		commit = true;
 	}
 
-	if (commit) {
+	if (in_command) {
 		commit_reversible_command ();
-	} else {
-		abort_reversible_command ();
 	}
 }
 
@@ -5801,8 +5922,7 @@ Editor::set_fade_in_active (bool yn)
 	if (rs.empty()) {
 		return;
 	}
-	bool commit = false;
-	begin_reversible_command (_("set fade in active"));
+	bool in_command = false;
 
 	for (RegionSelection::iterator x = rs.begin(); x != rs.end(); ++x) {
 		AudioRegionView* tmp = dynamic_cast<AudioRegionView*> (*x);
@@ -5816,14 +5936,16 @@ Editor::set_fade_in_active (bool yn)
 
 		ar->clear_changes ();
 		ar->set_fade_in_active (yn);
+
+		if (!in_command) {
+			begin_reversible_command (_("set fade in active"));
+			in_command = true;
+		}
 		_session->add_command (new StatefulDiffCommand (ar));
-		commit = true;
 	}
 
-	if (commit) {
+	if (in_command) {
 		commit_reversible_command ();
-	} else {
-		abort_reversible_command ();
 	}
 }
 
@@ -5835,8 +5957,7 @@ Editor::set_fade_out_active (bool yn)
 	if (rs.empty()) {
 		return;
 	}
-	bool commit = false;
-	begin_reversible_command (_("set fade out active"));
+	bool in_command = false;
 
 	for (RegionSelection::iterator x = rs.begin(); x != rs.end(); ++x) {
 		AudioRegionView* tmp = dynamic_cast<AudioRegionView*> (*x);
@@ -5849,14 +5970,16 @@ Editor::set_fade_out_active (bool yn)
 
 		ar->clear_changes ();
 		ar->set_fade_out_active (yn);
+
+		if (!in_command) {
+			begin_reversible_command (_("set fade out active"));
+			in_command = true;
+		}
 		_session->add_command(new StatefulDiffCommand (ar));
-		commit = true;
 	}
 
-	if (commit) {
+	if (in_command) {
 		commit_reversible_command ();
-	} else {
-		abort_reversible_command ();
 	}
 }
 
@@ -5893,8 +6016,7 @@ Editor::toggle_region_fades (int dir)
 	}
 
 	/* XXX should this undo-able? */
-	bool commit = false;
-	begin_reversible_command (_("toggle fade active"));
+	bool in_command = false;
 
 	for (RegionSelection::iterator i = rs.begin(); i != rs.end(); ++i) {
 		if ((ar = boost::dynamic_pointer_cast<AudioRegion>((*i)->region())) == 0) {
@@ -5909,14 +6031,15 @@ Editor::toggle_region_fades (int dir)
 		if (dir == -1 || dir == 0) {
 			ar->set_fade_out_active (!yn);
 		}
+		if (!in_command) {
+			begin_reversible_command (_("toggle fade active"));
+			in_command = true;
+		}
 		_session->add_command(new StatefulDiffCommand (ar));
-		commit = true;
 	}
 
-	if (commit) {
+	if (in_command) {
 		commit_reversible_command ();
-	} else {
-		abort_reversible_command ();
 	}
 }
 
@@ -7018,8 +7141,7 @@ Editor::insert_time (
 	if (Config->get_edit_mode() == Lock) {
 		return;
 	}
-	bool commit = false;
-	begin_reversible_command (_("insert time"));
+	bool in_command = false;
 
 	TrackViewList ts = selection->tracks.filter_to_unique_playlists ();
 
@@ -7059,17 +7181,24 @@ Editor::insert_time (
 
 			(*i)->shift (pos, frames, (opt == MoveIntersected), ignore_music_glue);
 
+			if (!in_command) {
+				begin_reversible_command (_("insert time"));
+				in_command = true;
+			}
 			vector<Command*> cmds;
 			(*i)->rdiff (cmds);
 			_session->add_commands (cmds);
 
 			_session->add_command (new StatefulDiffCommand (*i));
-			commit = true;
 		}
 
 		/* automation */
 		RouteTimeAxisView* rtav = dynamic_cast<RouteTimeAxisView*> (*x);
 		if (rtav) {
+			if (!in_command) {
+				begin_reversible_command (_("insert time"));
+				in_command = true;
+			}
 			rtav->route ()->shift (pos, frames);
 		}
 	}
@@ -7107,20 +7236,28 @@ Editor::insert_time (
 		}
 
 		if (moved) {
+			if (!in_command) {
+				begin_reversible_command (_("insert time"));
+				in_command = true;
+			}
 			XMLNode& after (_session->locations()->get_state());
 			_session->add_command (new MementoCommand<Locations>(*_session->locations(), &before, &after));
-			commit = true;
 		}
 	}
 
 	if (tempo_too) {
+		if (!in_command) {
+			begin_reversible_command (_("insert time"));
+			in_command = true;
+		}
+		XMLNode& before (_session->tempo_map().get_state());
 		_session->tempo_map().insert_time (pos, frames);
+		XMLNode& after (_session->tempo_map().get_state());
+		_session->add_command (new MementoCommand<TempoMap>(_session->tempo_map(), &before, &after));
 	}
 
-	if (commit) {
+	if (in_command) {
 		commit_reversible_command ();
-	} else {
-		abort_reversible_command ();
 	}
 }
 void
@@ -7192,8 +7329,7 @@ Editor::cut_time (framepos_t pos, framecnt_t frames, InsertTimeOption opt,
 		error << (_("Cannot insert or delete time when in Lock edit.")) << endmsg;
 		return;
 	}
-	bool commit = false;
-	begin_reversible_command (_("cut time"));
+	bool in_command = false;
 
 	for (TrackSelection::iterator x = selection->tracks.begin(); x != selection->tracks.end(); ++x) {
 		/* regions */
@@ -7209,15 +7345,22 @@ Editor::cut_time (framepos_t pos, framecnt_t frames, InsertTimeOption opt,
 			pl->cut (rl);
 			pl->shift (pos, -frames, true, ignore_music_glue);
 			
+			if (!in_command) {
+				begin_reversible_command (_("cut time"));
+				in_command = true;
+			}
 			XMLNode &after = pl->get_state();
 			
 			_session->add_command (new MementoCommand<Playlist> (*pl, &before, &after));
-			commit = true;
 		}
 			
 		/* automation */
 		RouteTimeAxisView* rtav = dynamic_cast<RouteTimeAxisView*> (*x);
 		if (rtav) {
+			if (!in_command) {
+				begin_reversible_command (_("cut time"));
+				in_command = true;
+			}
 			rtav->route ()->shift (pos, -frames);
 		}
 	}
@@ -7269,9 +7412,12 @@ Editor::cut_time (framepos_t pos, framecnt_t frames, InsertTimeOption opt,
 		}
 	
 		if (moved) {
+			if (!in_command) {
+				begin_reversible_command (_("cut time"));
+				in_command = true;
+			}
 			XMLNode& after (_session->locations()->get_state());
 			_session->add_command (new MementoCommand<Locations>(*_session->locations(), &before, &after));
-			commit = true;
 		}
 	}
 	
@@ -7279,16 +7425,17 @@ Editor::cut_time (framepos_t pos, framecnt_t frames, InsertTimeOption opt,
 		XMLNode& before (_session->tempo_map().get_state());
 
 		if (_session->tempo_map().cut_time (pos, frames) ) {
+			if (!in_command) {
+				begin_reversible_command (_("cut time"));
+				in_command = true;
+			}
 			XMLNode& after (_session->tempo_map().get_state());
 			_session->add_command (new MementoCommand<TempoMap>(_session->tempo_map(), &before, &after));
-			commit = true;
 		}
 	}
 	
-	if (commit) {
+	if (in_command) {
 		commit_reversible_command ();
-	} else {
-		abort_reversible_command ();
 	}
 }