Skip to content

Commit

Permalink
dlog fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
mvladic committed Feb 3, 2020
1 parent 1e7dcdf commit 90602a1
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/eez/modules/psu/dlog_record.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -681,7 +681,7 @@ void stateTransition(int transition, int* perr) {
err = SCPI_ERROR_CANNOT_CHANGE_TRANSIENT_TRIGGER;
}
} else if (transition == TRANSITION_ABORT || transition == TRANSITION_RESET) {
if (g_state == STATE_IDLE && transition == TRANSITION_RESET) {
if (g_state == STATE_IDLE) {
resetParameters();
} else if (g_state == STATE_INITIATED || g_state == STATE_EXECUTING) {
resetParameters();
Expand Down

0 comments on commit 90602a1

Please sign in to comment.