Fixed end of download detection based on new AcquisitionStopped() hel…

…per method on Oscilloscope. Fixed looping on PollTrigger() when scope is in Run mode.
ngscopeclient · Oct 9, 2024 · 1d6cd5b · 1d6cd5b
1 parent b419a0b
commit 1d6cd5b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/ngscopeclient/InstrumentThread.cpp b/src/ngscopeclient/InstrumentThread.cpp
@@ -92,7 +92,7 @@ void InstrumentThread(InstrumentThreadArgs args)
 				{	// Check for trigger state change
 					auto stat = scope->PollTrigger();
 					session->GetInstrumentConnectionState(inst)->m_lastTriggerState = stat;
-					if(stat == Oscilloscope::TRIGGER_MODE_STOP)
+					if(stat == Oscilloscope::TRIGGER_MODE_STOP || stat == Oscilloscope::TRIGGER_MODE_RUN || stat == Oscilloscope::TRIGGER_MODE_TRIGGERED)
 					{	// Final state
 						triggerUpToDate = true;
 					}

diff --git a/src/ngscopeclient/StreamBrowserDialog.cpp b/src/ngscopeclient/StreamBrowserDialog.cpp
@@ -359,7 +359,7 @@ bool StreamBrowserDialog::DoRender()
 				{
 					renderBadge(ImVec4(0.4, 0.4, 0.4, 1.0) /* XXX: pull color from prefs */, "disabled", "disa", NULL);
 				} 
-				else if (state && state->m_lastTriggerState != Oscilloscope::TRIGGER_MODE_STOP) 
+				else if (state) 
 				{
 					renderDownloadProgress(inst, chan);
 				}