summaryrefslogtreecommitdiff
path: root/libs/ardour/ticker.cc
diff options
context:
space:
mode:
authorCarl Hetherington <carl@carlh.net>2009-12-22 01:13:44 +0000
committerCarl Hetherington <carl@carlh.net>2009-12-22 01:13:44 +0000
commitc53115c650d9da64ba686425e8b90dc452ff862d (patch)
tree132ca301d49f9d87453d67064efb37966c80554f /libs/ardour/ticker.cc
parentdf7a3cc30c9be7528e5d76148d32c2dc2eed2cf3 (diff)
Fix assertion failure on transmission of MIDI clock.
git-svn-id: svn://localhost/ardour2/branches/3.0@6387 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/ticker.cc')
-rw-r--r--libs/ardour/ticker.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/ardour/ticker.cc b/libs/ardour/ticker.cc
index 2ef5abe5d5..dbe81ae32c 100644
--- a/libs/ardour/ticker.cc
+++ b/libs/ardour/ticker.cc
@@ -60,7 +60,7 @@ MidiClockTicker::session_going_away ()
void MidiClockTicker::update_midi_clock_port()
{
- _midi_port = _session->midi_clock_port();
+ _midi_port = _session->midi_clock_port();
}
void MidiClockTicker::transport_state_changed()
@@ -135,7 +135,7 @@ void MidiClockTicker::transport_looped()
void MidiClockTicker::tick(const nframes_t& transport_frames, const BBT_Time& /*transport_bbt*/, const Timecode::Time& /*transport_smpt*/)
{
- if (!Config->get_send_midi_clock() || _session == 0 || _session->transport_speed() != 1.0f)
+ if (!Config->get_send_midi_clock() || _session == 0 || _session->transport_speed() != 1.0f || _midi_port == 0)
return;
MIDI::JACK_MidiPort* jack_port = dynamic_cast<MIDI::JACK_MidiPort*>(_midi_port);