diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-10-16 16:32:26 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-10-16 16:32:26 +0100 |
| commit | da748cb939b586072b5cc8bba09f1c7f8b1236a3 (patch) | |
| tree | 5b5fe460ed4c2ec863198926b8873d3e97a37d00 /src/dcp_time.cc | |
| parent | ed18fc59be461a8f08ffa8d52897f2710e0359bf (diff) | |
| parent | 190dc3381a03b5cdbe12881015d16ff18303844a (diff) | |
Merge branch 'master' into 12bit
Diffstat (limited to 'src/dcp_time.cc')
| -rw-r--r-- | src/dcp_time.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/dcp_time.cc b/src/dcp_time.cc index d597e3dc..4c16a91a 100644 --- a/src/dcp_time.cc +++ b/src/dcp_time.cc @@ -59,12 +59,12 @@ Time::set (double ss) t = (int (round (ss * 1000)) % 1000) / 4; s = floor (ss); - if (s > 60) { + if (s >= 60) { m = s / 60; s -= m * 60; } - if (m > 60) { + if (m >= 60) { h = m / 60; m -= h * 60; } |