merge fix for #363 and #365 - thank you @nseam

Signed-off-by: Martin <[email protected]>
OpenHantek · Aug 8, 2023 · db25fbd · db25fbd
2 parents 50bbaac + 875a8dc
commit db25fbd
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/openhantek/src/mainwindow.cpp b/openhantek/src/mainwindow.cpp
@@ -286,8 +286,9 @@ MainWindow::MainWindow( HantekDsoControl *dsoControl, DsoSettings *settings, Exp
     connect( horizontalDock, &HorizontalDock::timebaseChanged, triggerDock, &TriggerDock::timebaseChanged );
     connect( horizontalDock, &HorizontalDock::timebaseChanged, dsoControl, [ dsoControl, this ]() {
         dsoControl->setRecordTime( dsoSettings->scope.horizontal.timebase * DIVS_TIME );
-        this->dsoWidget->updateTimebase( dsoSettings->scope.horizontal.timebase );
     } );
+    connect( horizontalDock, &HorizontalDock::timebaseChanged, this->dsoWidget,
+             [ this ]() { dsoWidget->updateTimebase( dsoSettings->scope.horizontal.timebase ); } );
     connect( spectrumDock, &SpectrumDock::frequencybaseChanged, this,
              [ this ]( double frequencybase ) { this->dsoWidget->updateFrequencybase( frequencybase ); } );
     connect( dsoControl, &HantekDsoControl::samplerateChanged, horizontalDock,