Remove wrong asserts

[ardour.git] / gtk2_ardour / editor_ops.cc

diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc
index 50d1bcc24c993d3bc35d455854ffa6435e1a2146..5419ce937484ecc353bf1108391c25bc101f68f2 100644 (file)
--- a/gtk2_ardour/editor_ops.cc
+++ b/gtk2_ardour/editor_ops.cc
@@ -102,7 +102,7 @@
 #include "transform_dialog.h"
 #include "ui_config.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;
@@ -2239,6 +2239,8 @@ Editor::set_session_end_from_playhead ()
 
                commit_reversible_command ();
        }
+
+       _session->set_end_is_free (false);
 }
 
 void
@@ -6293,11 +6295,11 @@ Editor::set_session_extents_from_selection ()
 
        Location* loc;
        if ((loc = _session->locations()->session_range_location()) == 0) {
-               _session->set_session_extents ( start, end );  // this will create a new session range;  no need for UNDO
+               _session->set_session_extents (start, end);  // this will create a new session range;  no need for UNDO
        } else {
                XMLNode &before = loc->get_state();
 
-               _session->set_session_extents ( start, end );
+               _session->set_session_extents (start, end);
 
                XMLNode &after = loc->get_state();
 
@@ -6307,6 +6309,8 @@ Editor::set_session_extents_from_selection ()
 
                commit_reversible_command ();
        }
+
+       _session->set_end_is_free (false);
 }
 
 void
@@ -7905,7 +7909,7 @@ Editor::update_bring_in_message (Gtk::Label* label, uint32_t n, uint32_t total,
 {
        Timers::TimerSuspender t;
        label->set_text (string_compose ("Copying %1, %2 of %3", name, n, total));
-       Gtkmm2ext::UI::instance()->flush_pending ();
+       Gtkmm2ext::UI::instance()->flush_pending (1);
 }
 
 void
@@ -7925,7 +7929,7 @@ Editor::bring_all_sources_into_session ()
         */
 
        Timers::TimerSuspender t;
-       Gtkmm2ext::UI::instance()->flush_pending ();
+       Gtkmm2ext::UI::instance()->flush_pending (3);
 
        cerr << " Do it\n";