From 108bfdb3c6baec7dc4cfd519909790c01fcc36e4 Mon Sep 17 00:00:00 2001 From: Chris Esposito Date: Tue, 6 Nov 2018 13:45:34 +1100 Subject: [PATCH] Pausing while triggered does not affect trigger delay --- Desktop_Interface/isodriver.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Desktop_Interface/isodriver.cpp b/Desktop_Interface/isodriver.cpp index 1bd2d2f5..8f59ea1d 100644 --- a/Desktop_Interface/isodriver.cpp +++ b/Desktop_Interface/isodriver.cpp @@ -797,8 +797,8 @@ void isoDriver::frameActionGeneric(char CH1_mode, char CH2_mode) //0 for off, 1 } } - readData375_CH1 = internalBuffer375_CH1->readBuffer(window,GRAPH_SAMPLES,CH1_mode==2, delay + ((triggerEnabled && !paused_CH1) ? triggerDelay + window/2 : 0)); - if(CH2_mode) readData375_CH2 = internalBuffer375_CH2->readBuffer(window,GRAPH_SAMPLES,CH2_mode==2, delay + ((triggerEnabled && !paused_CH2) ? triggerDelay + window/2 : 0)); + readData375_CH1 = internalBuffer375_CH1->readBuffer(window,GRAPH_SAMPLES,CH1_mode==2, delay + (triggerEnabled ? triggerDelay + window/2 : 0)); + if(CH2_mode) readData375_CH2 = internalBuffer375_CH2->readBuffer(window,GRAPH_SAMPLES,CH2_mode==2, delay + (triggerEnabled ? triggerDelay + window/2 : 0)); if(CH1_mode == -1) readData750 = internalBuffer750->readBuffer(window,GRAPH_SAMPLES,false, delay + (triggerEnabled ? triggerDelay + window/2 : 0)); if(CH1_mode == -2) readDataFile = internalBufferFile->readBuffer(window,GRAPH_SAMPLES,false, delay);