merged with latest release

fake-merged because of the cherry-pick

5 files changed, 10 insertions, 2 deletions

diff --git a/muse2/muse/widgets/bigtime.cpp b/muse2/muse/widgets/bigtime.cpp
index af49cea1..0b213f28 100644
--- a/muse2/muse/widgets/bigtime.cpp
+++ b/muse2/muse/widgets/bigtime.cpp
@@ -104,7 +104,6 @@ BigTime::BigTime(QWidget* parent)
       setWindowTitle(tr("MusE: Bigtime"));
       }
 
-
 //---------------------------------------------------------
 //   fmtButtonToggled
 //---------------------------------------------------------
diff --git a/muse2/muse/widgets/drange.cpp b/muse2/muse/widgets/drange.cpp
index 7669c18c..20c92e96 100644
--- a/muse2/muse/widgets/drange.cpp
+++ b/muse2/muse/widgets/drange.cpp
@@ -165,6 +165,9 @@ void DoubleRange::setRange(double vmin, double vmax, double vstep, int pageSize)
       {
       bool rchg = ((d_maxValue != vmax) || (d_minValue != vmin));
 
+      if(!rchg && vstep == d_step && pageSize == d_pageSize)    // p4.0.45
+        return;
+      
       if (rchg) {
             d_minValue = vmin;
             d_maxValue = vmax;
diff --git a/muse2/muse/widgets/knob.cpp b/muse2/muse/widgets/knob.cpp
index 269f65cf..e53e1a05 100644
--- a/muse2/muse/widgets/knob.cpp
+++ b/muse2/muse/widgets/knob.cpp
@@ -115,6 +115,9 @@ void Knob::setTotalAngle (double angle)
 
 void Knob::setRange(double vmin, double vmax, double vstep, int pagesize)
       {
+      //if(vmin == d_minValue && vmax == d_maxValue && vstep == d_step && pageSize == d_pageSize)    // p4.0.45
+      //  return;
+      
       // divide by zero protection. probably too cautious
       if (! (vmin == vmax || qMax(-vmin, vmax) == 0))
             {
diff --git a/muse2/muse/widgets/meter.cpp b/muse2/muse/widgets/meter.cpp
index d9ca8e20..f46f17c1 100644
--- a/muse2/muse/widgets/meter.cpp
+++ b/muse2/muse/widgets/meter.cpp
@@ -217,6 +217,9 @@ void Meter::resetPeaks()
 
 void Meter::setRange(double min, double max)
       {
+      if(min == minScale && max == maxScale)   // p4.0.45
+        return;
+      
       minScale = min;
       maxScale = max;
       cur_yv = -1;  // Force re-initialization.
diff --git a/muse2/muse/widgets/visibletracks.cpp b/muse2/muse/widgets/visibletracks.cpp
index 4976ecf9..e314d0fe 100644
--- a/muse2/muse/widgets/visibletracks.cpp
+++ b/muse2/muse/widgets/visibletracks.cpp
@@ -82,7 +82,7 @@ VisibleTracks::VisibleTracks(QWidget* parent, const char*)
       // Note: Does not take ownership.
       addActions(action->actions());
 
-      connect(action, SIGNAL(selected(QAction*)), SLOT(visibilityChanged(QAction*)));
+      connect(action, SIGNAL(triggered(QAction*)), SLOT(visibilityChanged(QAction*)));
       }