fix: cancel widget read tasks after a control scheme start failure

nvsukhanov · Mar 26, 2024 · 5239bcb · 5239bcb
1 parent a7abffa
commit 5239bcb
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 5 deletions.
diff --git a/modules/store/src/lib/effects/control-scheme/scheme-pre-run/create-widget-read-tasks.ts b/modules/store/src/lib/effects/control-scheme/scheme-pre-run/create-widget-read-tasks.ts
@@ -8,21 +8,24 @@ import { IWidgetsReadTasksFactory } from './i-widgets-read-tasks-factory';
 export function createWidgetReadTasks(
     scheme: ControlSchemeModel,
     store: Store,
-    widgetTaskFactory: IWidgetsReadTasksFactory
+    widgetTaskFactory: IWidgetsReadTasksFactory,
 ): Array<Observable<unknown>> {
     const result: Array<Observable<unknown>> = [];
     const readerTasks = widgetTaskFactory.createReadTasks(scheme.widgets);
     for (const task of readerTasks) {
         const obs = new Observable((subscriber) => {
             let initialValueReceived = false;
-            task.subscribe((taskData) => {
+            const sub = task.subscribe((taskData) => {
                 if (!initialValueReceived) {
                     initialValueReceived = true;
                     subscriber.next(null);
                     subscriber.complete();
                 }
                 store.dispatch(CONTROL_SCHEME_WIDGETS_DATA_ACTIONS.updateWidgetData(taskData));
             });
+            return () => {
+                sub.unsubscribe();
+            };
         });
 
         result.push(obs);

diff --git a/modules/store/src/lib/reducers/control-scheme-widgets-data.reducer.ts b/modules/store/src/lib/reducers/control-scheme-widgets-data.reducer.ts
@@ -13,7 +13,12 @@ export const CONTROL_SCHEME_WIDGET_DATA_FEATURE = createFeature({
         {
             widgetsData: {}
         } as ControlSchemeWidgetsDataState,
-        on(CONTROL_SCHEME_ACTIONS.startScheme, CONTROL_SCHEME_ACTIONS.schemeStopped, (): ControlSchemeWidgetsDataState => ({ widgetsData: {} })),
+        on(
+            CONTROL_SCHEME_ACTIONS.startScheme,
+            CONTROL_SCHEME_ACTIONS.schemeStopped,
+            CONTROL_SCHEME_ACTIONS.schemeStartFailed,
+            (): ControlSchemeWidgetsDataState => ({ widgetsData: {} })
+        ),
         on(CONTROL_SCHEME_WIDGETS_DATA_ACTIONS.updateWidgetData, (state, { widgetId, data }): ControlSchemeWidgetsDataState => {
             return {
                 ...state,

diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json
@@ -831,7 +831,8 @@
     "1-2-8": {
       "minorNotificationImprovements": "Minor improvements to notifications",
       "addGamepadPollingRateSettings": "Gamepad polling rate option added to the settings",
-      "increaseGamepadPollingRate": "Increased default gamepad poll rate. Previous value is now considered 'Low' in the settings"
+      "increaseGamepadPollingRate": "Increased default gamepad poll rate. Previous value is now considered 'Low' in the settings",
+      "fixWidgetUpdatesAfterSchemeStartFailure": "Fixed widgets continuing to update after a control scheme start failure"
     }
   }
 }
diff --git a/src/assets/i18n/ru.json b/src/assets/i18n/ru.json
@@ -831,7 +831,8 @@
     "1-2-8": {
       "minorNotificationImprovements": "Небольшие улучшения уведомлений",
       "addGamepadPollingRateSettings": "Добавлены настройки частоты опроса геймпада",
-      "increaseGamepadPollingRate": "Увеличена частота опроса геймпада. Предыдущая частота доступна в настройках как 'Низкая'"
+      "increaseGamepadPollingRate": "Увеличена частота опроса геймпада. Предыдущая частота доступна в настройках как 'Низкая'",
+      "fixWidgetUpdatesAfterSchemeStartFailure": "Исправлены обновления виджетов после неудачного запуска схемы управления"
     }
   }
 }
diff --git a/src/changelog.ts b/src/changelog.ts
@@ -7,6 +7,7 @@ export const CHANGELOG: IChangelog = [
             'changelog.1-2-8.minorNotificationImprovements',
             'changelog.1-2-8.addGamepadPollingRateSettings',
             'changelog.1-2-8.increaseGamepadPollingRate',
+            'changelog.1-2-8.fixWidgetUpdatesAfterSchemeStartFailure',
         ]
     },
     {