From 522986075e549bc125183f852e6db444b1aaeedb Mon Sep 17 00:00:00 2001
From: Nathaniel Paulus <nathaniel_paulus@sil.org>
Date: Tue, 1 Oct 2024 13:16:07 -0400
Subject: [PATCH] SF-3010 Fix error activating undefined question (#2757)

---
 .../checking-questions.component.ts                 | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/SIL.XForge.Scripture/ClientApp/src/app/checking/checking/checking-questions/checking-questions.component.ts b/src/SIL.XForge.Scripture/ClientApp/src/app/checking/checking/checking-questions/checking-questions.component.ts
index 7ce3b50fce..3628630fac 100644
--- a/src/SIL.XForge.Scripture/ClientApp/src/app/checking/checking/checking-questions/checking-questions.component.ts
+++ b/src/SIL.XForge.Scripture/ClientApp/src/app/checking/checking/checking-questions/checking-questions.component.ts
@@ -18,9 +18,9 @@ import { Operation } from 'realtime-server/lib/esm/common/models/project-rights'
 import { Answer } from 'realtime-server/lib/esm/scriptureforge/models/answer';
 import { Comment } from 'realtime-server/lib/esm/scriptureforge/models/comment';
 import { SFProjectProfile } from 'realtime-server/lib/esm/scriptureforge/models/sf-project';
-import { SF_PROJECT_RIGHTS, SFProjectDomain } from 'realtime-server/lib/esm/scriptureforge/models/sf-project-rights';
+import { SFProjectDomain, SF_PROJECT_RIGHTS } from 'realtime-server/lib/esm/scriptureforge/models/sf-project-rights';
 import { SFProjectUserConfig } from 'realtime-server/lib/esm/scriptureforge/models/sf-project-user-config';
-import { toVerseRef, VerseRefData } from 'realtime-server/lib/esm/scriptureforge/models/verse-ref-data';
+import { VerseRefData, toVerseRef } from 'realtime-server/lib/esm/scriptureforge/models/verse-ref-data';
 import { Subject, Subscription } from 'rxjs';
 import { debounceTime } from 'rxjs/operators';
 import { I18nService } from 'xforge-common/i18n.service';
@@ -31,7 +31,7 @@ import { SFProjectProfileDoc } from '../../../core/models/sf-project-profile-doc
 import { SFProjectUserConfigDoc } from '../../../core/models/sf-project-user-config-doc';
 import { SFProjectService } from '../../../core/sf-project.service';
 import { TranslationEngineService } from '../../../core/translation-engine.service';
-import { BookChapter, bookChapterMatchesVerseRef, CheckingUtils } from '../../checking.utils';
+import { BookChapter, CheckingUtils, bookChapterMatchesVerseRef } from '../../checking.utils';
 
 export interface QuestionChangeActionSource {
   /** True during events due to a questions doc change such as with a filter. */
@@ -236,7 +236,7 @@ export class CheckingQuestionsComponent extends SubscriptionDisposable implement
   /**
    * Activates the question that a user has most recently viewed if available
    */
-  activateStoredQuestion(actionSource?: QuestionChangeActionSource): QuestionDoc {
+  activateStoredQuestion(actionSource?: QuestionChangeActionSource): void {
     let questionToActivate: QuestionDoc | undefined;
     let activeQuestionDocId: string | undefined;
 
@@ -274,8 +274,9 @@ export class CheckingQuestionsComponent extends SubscriptionDisposable implement
         ) ?? this.questionDocs[0];
     }
 
-    this.activateQuestion(questionToActivate, actionSource);
-    return questionToActivate;
+    if (questionToActivate != null) {
+      this.activateQuestion(questionToActivate, actionSource);
+    }
   }
 
   updateElementsRead(questionDoc: QuestionDoc): void {