summaryrefslogtreecommitdiff
path: root/libs/ardour/audio_diskstream.cc
diff options
context:
space:
mode:
authorCarl Hetherington <carl@carlh.net>2010-03-23 13:11:14 +0000
committerCarl Hetherington <carl@carlh.net>2010-03-23 13:11:14 +0000
commiteb6ae56fafa8cc1cf5309a33e40227a402ee608d (patch)
treeb66006ddd67b31ac30efcb2aee473bbed7ec542b /libs/ardour/audio_diskstream.cc
parentb5c21e65fc236ea75bc00961941d80ea42c0fa61 (diff)
Fix track mode options to appear only once on audio tracks rather than twice. Fix event handling logic for these options. HIG-ify some menu items.
git-svn-id: svn://localhost/ardour2/branches/3.0@6787 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/audio_diskstream.cc')
-rw-r--r--libs/ardour/audio_diskstream.cc5
1 files changed, 4 insertions, 1 deletions
diff --git a/libs/ardour/audio_diskstream.cc b/libs/ardour/audio_diskstream.cc
index 03f17c6e76..e5dfb238db 100644
--- a/libs/ardour/audio_diskstream.cc
+++ b/libs/ardour/audio_diskstream.cc
@@ -2299,7 +2299,10 @@ AudioDiskstream::can_become_destructive (bool& requires_bounce) const
}
boost::shared_ptr<Region> first = _playlist->find_next_region (_session.current_start_frame(), Start, 1);
- assert (first);
+ if (!first) {
+ requires_bounce = false;
+ return true;
+ }
/* do the source(s) for the region cover the session start position ? */