prevent crash during track-deletion (un-selecting deleted tracks)

[ardour.git] / gtk2_ardour / editor_ops.cc

diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc
index 86ff4cd045b17a8e7602b225aac9eebb1fff046f..3d7adc55849583aa17c872d9cf14737ee17235cb 100644 (file)
--- a/gtk2_ardour/editor_ops.cc
+++ b/gtk2_ardour/editor_ops.cc
@@ -82,6 +82,7 @@
 #include "item_counts.h"
 #include "keyboard.h"
 #include "midi_region_view.h"
+#include "mixer_ui.h"
 #include "mixer_strip.h"
 #include "mouse_cursors.h"
 #include "normalize_dialog.h"
@@ -4822,6 +4823,13 @@ Editor::paste_internal (framepos_t position, float times, const int32_t sub_num)
        commit_reversible_command ();
 }
 
+void
+Editor::duplicate_regions (float times)
+{
+       RegionSelection rs (get_regions_from_selection_and_entered());
+       duplicate_some_regions (rs, times);
+}
+
 void
 Editor::duplicate_some_regions (RegionSelection& regions, float times)
 {
@@ -5049,7 +5057,7 @@ Editor::normalize_region ()
 
        NormalizeDialog dialog (rs.size() > 1);
 
-       if (dialog.run () == RESPONSE_CANCEL) {
+       if (dialog.run () != RESPONSE_ACCEPT) {
                return;
        }
 
@@ -5374,6 +5382,11 @@ Editor::quantize_regions (const RegionSelection& rs)
                quantize_dialog = new QuantizeDialog (*this);
        }
 
+       if (quantize_dialog->is_mapped()) {
+               /* in progress already */
+               return;
+       }
+
        quantize_dialog->present ();
        const int r = quantize_dialog->run ();
        quantize_dialog->hide ();
@@ -7348,6 +7361,9 @@ edit your ardour.rc file to set the\n\
                return;
        }
 
+
+       Mixer_UI::instance()->selection().block_routes_changed (true);
+       selection->block_tracks_changed (true);
        {
                DisplaySuspender ds;
                boost::shared_ptr<RouteList> rl (new RouteList);
@@ -7360,6 +7376,9 @@ edit your ardour.rc file to set the\n\
         * destructors are called,
         * diskstream drops references, save_state is called (again for every track)
         */
+       selection->block_tracks_changed (false);
+       Mixer_UI::instance()->selection().block_routes_changed (false);
+       selection->TracksChanged (); /* EMIT SIGNAL */
 }
 
 void
@@ -7381,7 +7400,7 @@ Editor::do_insert_time ()
        }
 
        insert_time (
-               get_preferred_edit_position (EDIT_IGNORE_MOUSE),
+               d.position(),
                d.distance(),
                d.intersected_region_action (),
                d.all_playlists(),
@@ -7530,7 +7549,6 @@ Editor::do_remove_time ()
                return;
        }
 
-       framepos_t pos = get_preferred_edit_position (EDIT_IGNORE_MOUSE);
        InsertRemoveTimeDialog d (*this, true);
 
        int response = d.run ();
@@ -7546,7 +7564,7 @@ Editor::do_remove_time ()
        }
 
        remove_time (
-               pos,
+               d.position(),
                distance,
                SplitIntersected,
                d.move_glued(),