Mercurial > hg > svgui

changeset 1417:2487521e857b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Chris Cannam
date Wed, 23 Jan 2019 14:44:16 +0000
parents d794630429a7 (diff) fa986b91d77f (current diff)
children e866102db32a 8e40faa56ffd
files layer/RegionLayer.cpp view/View.cpp
diffstat 2 files changed, 4 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/layer/RegionLayer.cpp	Wed Jan 09 15:24:51 2019 +0000
+++ b/layer/RegionLayer.cpp	Wed Jan 23 14:44:16 2019 +0000
@@ -878,8 +878,6 @@
 //    Profiler profiler("RegionLayer::paint", true);
 
     int x0 = rect.left() - 40, x1 = rect.right();
-    sv_frame_t frame0 = v->getFrameForX(x0);
-    sv_frame_t frame1 = v->getFrameForX(x1);
 
     sv_frame_t wholeFrame0 = v->getFrameForX(0);
     sv_frame_t wholeFrame1 = v->getFrameForX(v->getPaintWidth());
--- a/view/View.cpp	Wed Jan 09 15:24:51 2019 +0000
+++ b/view/View.cpp	Wed Jan 23 14:44:16 2019 +0000
@@ -1158,7 +1158,10 @@
 
             sv_frame_t w = getEndFrame() - getStartFrame();
             w -= w/5;
-            sv_frame_t sf = (m_playPointerFrame / w) * w - w/8;
+            sv_frame_t sf = m_playPointerFrame;
+            if (w > 0) {
+                sf = (sf / w) * w - w/8;
+            }
 
             if (m_manager &&
                 m_manager->isPlaying() &&