diff options
author | Carl Hetherington <carl@carlh.net> | 2009-08-24 02:10:46 +0000 |
---|---|---|
committer | Carl Hetherington <carl@carlh.net> | 2009-08-24 02:10:46 +0000 |
commit | 27feb19897c7edc2ef9a80be35f57dcb61156a5b (patch) | |
tree | 1dce3f60db3c7bef9bbefa1deea7f2c4b5885399 /gtk2_ardour | |
parent | 09eee1bb7c2463d426fc5864036af875ebf95d3e (diff) |
Small cleanup.
git-svn-id: svn://localhost/ardour2/branches/3.0@5574 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour')
-rw-r--r-- | gtk2_ardour/editor_drag.cc | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/gtk2_ardour/editor_drag.cc b/gtk2_ardour/editor_drag.cc index 76c12ac444..9c4315c10b 100644 --- a/gtk2_ardour/editor_drag.cc +++ b/gtk2_ardour/editor_drag.cc @@ -722,7 +722,6 @@ RegionMoveDrag::motion (GdkEvent* event, bool first_move) void RegionMoveDrag::finished (GdkEvent* /*event*/, bool movement_occurred) { - bool nocommit = true; vector<RegionView*> copies; boost::shared_ptr<Diskstream> ds; boost::shared_ptr<Playlist> from_playlist; @@ -739,11 +738,9 @@ RegionMoveDrag::finished (GdkEvent* /*event*/, bool movement_occurred) if (!movement_occurred) { /* just a click */ - goto out; + return; } - nocommit = false; - if (Config->get_edit_mode() == Splice && !_editor->pre_drag_region_selection.empty()) { _editor->selection->set (_editor->pre_drag_region_selection); _editor->pre_drag_region_selection.clear (); @@ -970,13 +967,11 @@ RegionMoveDrag::finished (GdkEvent* /*event*/, bool movement_occurred) } out: - if (!nocommit) { - for (set<boost::shared_ptr<Playlist> >::iterator p = modified_playlists.begin(); p != modified_playlists.end(); ++p) { - _editor->session->add_command (new MementoCommand<Playlist>(*(*p), 0, &(*p)->get_state())); - } - - _editor->commit_reversible_command (); + for (set<boost::shared_ptr<Playlist> >::iterator p = modified_playlists.begin(); p != modified_playlists.end(); ++p) { + _editor->session->add_command (new MementoCommand<Playlist>(*(*p), 0, &(*p)->get_state())); } + + _editor->commit_reversible_command (); for (vector<RegionView*>::iterator x = copies.begin(); x != copies.end(); ++x) { delete *x; |