TriggerPropertiesDialog: fixed bug where typing a new position into the properties dialog did not actually update the trigger position in hardware

Author: azonenberg

release-notes/CHANGELOG.md

@@ -14,6 +14,7 @@ This is a running list of significant bug fixes and new features since the last
 * Incorrect loading of CSV files with Windows line endings (https://github.com/ngscopeclient/scopehal/issues/1002)
 * Incorrect buffer size calculation in DeEmbedFilter unit test causing intermittent crashes of the test case in CI (no github ticket)
 * ThunderScope: trigger position would occasionally be corrupted and get stuck at -9223 seconds (no github ticket)
+* Typing a new trigger position into the text box in the trigger properties dialog does not actually change the trigger position in hardware (no github ticket)
 
 ## Other changes since v0.1
 

src/ngscopeclient/TriggerPropertiesDialog.cpp

@@ -102,23 +102,23 @@ void TriggerPropertiesPage::Render(bool graphEditorMode)
 	{
 		if(StartSection("Position", graphEditorMode))
 		{
-			//Check if trigger offset changed outside the dialog
-			Unit fs(Unit::UNIT_FS);
-			float off = m_scope->GetTriggerOffset();
-			if(m_committedTriggerOffset != off)
-			{
-				m_committedTriggerOffset = off;
-				m_triggerOffset = fs.PrettyPrint(off);
-			}
-
 			//Actual trigger position
+			Unit fs(Unit::UNIT_FS);
 			if(Dialog::UnitInputWithImplicitApply(
 				"Delay",
 				m_triggerOffset,
 				m_committedTriggerOffset,
 				fs))
 			{
-				m_scope->SetTriggerOffset(off);
+				m_scope->SetTriggerOffset(m_committedTriggerOffset);
+			}
+
+			//Check if trigger offset changed outside the dialog
+			float off = m_scope->GetTriggerOffset();
+			if(m_committedTriggerOffset != off)
+			{
+				m_committedTriggerOffset = off;
+				m_triggerOffset = fs.PrettyPrint(off);
 			}
 
 			Dialog::HelpMarker(