Mercurial > hg > svgui

diff layer/WaveformLayer.cpp @ 860:4a5d144bd5d0 tonioni

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from default branch
author Chris Cannam
date Tue, 09 Sep 2014 16:36:21 +0100
parents d282967236d5
children 4a578a360011
line wrap: on
line diff
--- a/layer/WaveformLayer.cpp	Tue Sep 02 16:23:48 2014 +0100
+++ b/layer/WaveformLayer.cpp	Tue Sep 09 16:36:21 2014 +0100
@@ -46,7 +46,8 @@
     m_middleLineHeight(0.5),
     m_aggressive(false),
     m_cache(0),
-    m_cacheValid(false)
+    m_cacheValid(false),
+    m_cacheZoomLevel(0)
 {
     
 }
@@ -457,8 +458,8 @@
     int minChannel = 0, maxChannel = 0;
     bool mergingChannels = false, mixingChannels = false;
 
-    getChannelArrangement(minChannel, maxChannel,
-                          mergingChannels, mixingChannels);
+    (void)getChannelArrangement(minChannel, maxChannel,
+                                mergingChannels, mixingChannels);
 
     if (mergingChannels || mixingChannels) {
         RangeSummarisableTimeValueModel::Range otherRange =
@@ -1042,7 +1043,7 @@
 
     channels = getChannelArrangement(minChannel, maxChannel,
                                      mergingChannels, mixingChannels);
-
+    if (channels == 0) return 0;
     if (maxChannel < minChannel || channel < minChannel) return 0;
 
     int h = v->height();
@@ -1085,7 +1086,7 @@
 
     channels = getChannelArrangement(minChannel, maxChannel,
                                      mergingChannels, mixingChannels);
-
+    if (channels == 0) return 0;
     if (maxChannel < minChannel) return 0;
 
     int h = v->height();