rework AudioUnit variable input port count.

[ardour.git] / gtk2_ardour / main_clock.cc

diff --git a/gtk2_ardour/main_clock.cc b/gtk2_ardour/main_clock.cc
index 26d780ea8a1655ebaac2cfd53490ef5e815ac0b3..c7cb4102a87041b46007fc48943d1860ddee5713 100644 (file)
--- a/gtk2_ardour/main_clock.cc
+++ b/gtk2_ardour/main_clock.cc
@@ -73,7 +73,7 @@ MainClock::absolute_time () const
 {
        if (get_is_duration ()) {
                // delta to edit cursor
-               return current_time () + PublicEditor::instance().get_preferred_edit_position (true);
+               return current_time () + PublicEditor::instance().get_preferred_edit_position (Editing::EDIT_IGNORE_PHEAD);
        } else {
                return current_time ();
        }
@@ -92,6 +92,7 @@ MainClock::display_delta_to_edit_cursor ()
 void
 MainClock::edit_current_tempo ()
 {
+       if (!PublicEditor::instance().session()) return;
        ARDOUR::TempoSection ts = PublicEditor::instance().session()->tempo_map().tempo_section_at (absolute_time());
        PublicEditor::instance().edit_tempo_section (&ts);
 }
@@ -99,6 +100,7 @@ MainClock::edit_current_tempo ()
 void
 MainClock::edit_current_meter ()
 {
+       if (!PublicEditor::instance().session()) return;
        ARDOUR::MeterSection ms = PublicEditor::instance().session()->tempo_map().meter_section_at (absolute_time());
        PublicEditor::instance().edit_meter_section (&ms);
 }