Issue #3316230: Fix state check in onReturn()

Closes #3316230

Merge request reports

Loading