diff options
| author | David Robillard <d@drobilla.net> | 2008-02-16 22:55:47 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2008-02-16 22:55:47 +0000 |
| commit | 859e9106e72a7908fa093d946111d148223225a0 (patch) | |
| tree | ec47825b5f5746bcbc5d321d40da7fc798f5c380 /libs/ardour/region.cc | |
| parent | 8aa9508c82f32efcf9c7c00e2c9e76268d4dddce (diff) | |
Merge with 2.0-ongoing R3071.
git-svn-id: svn://localhost/ardour2/branches/3.0@3074 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/region.cc')
| -rw-r--r-- | libs/ardour/region.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libs/ardour/region.cc b/libs/ardour/region.cc index 2193a69908..508f09a480 100644 --- a/libs/ardour/region.cc +++ b/libs/ardour/region.cc @@ -957,14 +957,14 @@ Region::adjust_to_sync (nframes_t pos) // cerr << "adjusting pos = " << pos << " to sync at " << _sync_position << " offset = " << offset << " with dir = " << sync_dir << endl; if (sync_dir > 0) { - if (max_frames - pos > offset) { + if (pos > offset) { pos -= offset; + } else { + pos = 0; } } else { - if (pos > offset) { + if (max_frames - pos > offset) { pos += offset; - } else { - pos = 0; } } |