merged with release_2_0

1 files changed, 17 insertions, 0 deletions

diff --git a/muse2/muse/transport.cpp b/muse2/muse/transport.cpp
index aa0036e5..5ed83800 100644
--- a/muse2/muse/transport.cpp
+++ b/muse2/muse/transport.cpp
@@ -538,6 +538,11 @@ void Transport::setTempo(int t)
             tempo->setTempo(t);
             tempoVal = t;
             }
+      blockSignals(true);
+      // Make sure positional controls are updated
+      unsigned v = MusEGlobal::song->cpos();
+      time2->setValue(v); // time2 is SMPTE, it only need tempo updates.
+      blockSignals(false);
       }
 
 //---------------------------------------------------------
@@ -558,7 +563,19 @@ void Transport::setHandleColor(QColor c)
 
 void Transport::setTimesig(int z, int n)
       {
+      blockSignals(true);
       tempo->setTimesig(z, n);
+      
+      // Make sure positional controls are updated
+      unsigned v = MusEGlobal::song->cpos();
+      time1->setValue(v); // time2 is SMPTE. It only need tempo updates.
+      
+      v = MusEGlobal::song->lpos();      
+      tl1->setValue(v);
+      v = MusEGlobal::song->rpos();      
+      tl2->setValue(v);
+      
+      blockSignals(false);
       }
 
 //---------------------------------------------------------