dlog fixes

eez-open · Jun 26, 2021 · f512379 · f512379
1 parent fc17c35
commit f512379
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/eez/modules/psu/dlog_record.cpp b/src/eez/modules/psu/dlog_record.cpp
@@ -809,7 +809,8 @@ void toggleStart() {
 	if (trigger::g_triggerInitiateAll) {
 		if (trigger::isIdle() && trigger::g_triggerSource == trigger::SOURCE_IMMEDIATE) {
 			int err = trigger::startImmediately();
-			if (err != SCPI_RES_OK) {
+			if (err != SCPI_RES_OK && err != SCPI_ERROR_CANNOT_INITIATE_WHILE_IN_FIXED_MODE) {
+				dlog_record::g_recordingParameters.filePath[0] = 0;
 				eez::psu::gui::psuErrorMessage(g_errorChannelIndex, MakeScpiErrorValue(err));
 				return;
 			}

diff --git a/src/eez/modules/psu/dlog_view.cpp b/src/eez/modules/psu/dlog_view.cpp
@@ -135,8 +135,8 @@ static void changeXAxisDiv(Recording &recording, double xAxisDiv);
 ////////////////////////////////////////////////////////////////////////////////
 
 void tick() {
-	if (g_state == STATE_READY) {
-        loadSamples();
+	if (psu::gui::isPageOnStack(PAGE_ID_DLOG_VIEW) && &getRecording() == &g_dlogFile && g_state == STATE_READY) {
+		loadSamples();
 
 		if (g_bookmarksScrollPosition != g_loadedBookmarksScrollPosition) {
 			loadBookmarks();