diff options
| author | David Robillard <d@drobilla.net> | 2007-01-15 18:33:54 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2007-01-15 18:33:54 +0000 |
| commit | 7701c52adb28ce53ebec2a51e9b3ee0fee4f5ebd (patch) | |
| tree | 9c9403a4ac6d1117731a5aa95d5be9a4ca68928c /libs/ardour/audio_playlist.cc | |
| parent | 32f3a4ae3e41f0c348dadd0811817c832b624438 (diff) | |
Merged with trunk R1327.
git-svn-id: svn://localhost/ardour2/branches/midi@1328 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/audio_playlist.cc')
| -rw-r--r-- | libs/ardour/audio_playlist.cc | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/libs/ardour/audio_playlist.cc b/libs/ardour/audio_playlist.cc index dcba0ae31c..a6d73e8544 100644 --- a/libs/ardour/audio_playlist.cc +++ b/libs/ardour/audio_playlist.cc @@ -277,9 +277,14 @@ AudioPlaylist::refresh_dependents (boost::shared_ptr<Region> r) if ((*x)->involves (ar)) { if (find (updated.begin(), updated.end(), *x) == updated.end()) { - if ((*x)->refresh ()) { - /* not invalidated by the refresh */ - updated.insert (*x); + try { + if ((*x)->refresh ()) { + updated.insert (*x); + } + } + + catch (Crossfade::NoCrossfadeHere& err) { + // relax, Invalidated during refresh } } } @@ -353,6 +358,7 @@ AudioPlaylist::check_dependents (boost::shared_ptr<Region> r, bool norefresh) refresh_dependents (r); } + if (!Config->get_auto_xfade()) { return; } |