# HG changeset patch
# User Chris Cannam
# Date 1548254656 0
# Node ID 2487521e857b0cddae6b81892418f2c68b89dbdd
# Parent  d794630429a78ace935810b81229c1c05fab0642# Parent  fa986b91d77f412f7e801a3cdfc3d0878505fa2c
Merge

diff -r fa986b91d77f -r 2487521e857b layer/RegionLayer.cpp
--- 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());
diff -r fa986b91d77f -r 2487521e857b view/View.cpp
--- 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() &&