From 8bfe4cc685e2cbb91315392150b53672f74a8db8 Mon Sep 17 00:00:00 2001 From: Paul Licameli Date: Sat, 29 Apr 2017 21:41:38 -0400 Subject: [PATCH] Fix more cases of Wave and Note track editing wrongly throwing --- src/NoteTrack.cpp | 6 +++--- src/WaveTrack.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/NoteTrack.cpp b/src/NoteTrack.cpp index a5cf29751..fdd7c833b 100644 --- a/src/NoteTrack.cpp +++ b/src/NoteTrack.cpp @@ -435,7 +435,7 @@ int NoteTrack::GetVisibleChannels() Track::Holder NoteTrack::Cut(double t0, double t1) { - if (t1 <= t0) + if (t1 < t0) THROW_INCONSISTENCY_EXCEPTION; double len = t1-t0; @@ -458,7 +458,7 @@ Track::Holder NoteTrack::Cut(double t0, double t1) Track::Holder NoteTrack::Copy(double t0, double t1, bool) const { - if (t1 <= t0) + if (t1 < t0) THROW_INCONSISTENCY_EXCEPTION; double len = t1-t0; @@ -481,7 +481,7 @@ Track::Holder NoteTrack::Copy(double t0, double t1, bool) const bool NoteTrack::Trim(double t0, double t1) { - if (t1 <= t0) + if (t1 < t0) return false; mSeq->convert_to_seconds(); // DELETE way beyond duration just in case something is out there: diff --git a/src/WaveTrack.cpp b/src/WaveTrack.cpp index 060d0e7fd..da0973d84 100644 --- a/src/WaveTrack.cpp +++ b/src/WaveTrack.cpp @@ -646,7 +646,7 @@ void WaveTrack::Trim (double t0, double t1) Track::Holder WaveTrack::Copy(double t0, double t1, bool forClipboard) const { - if (t1 <= t0) + if (t1 < t0) THROW_INCONSISTENCY_EXCEPTION; WaveTrack *newTrack;