Skip to content

Commit 4fc4dbb

Browse files
fix(ui): ensure query subs are reset in case of error
1 parent d4f6d09 commit 4fc4dbb

File tree

2 files changed

+4
-8
lines changed

2 files changed

+4
-8
lines changed

invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/setDefaultSettings.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,8 @@ export const addSetDefaultSettingsListener = (startAppListening: AppStartListeni
3939
return;
4040
}
4141

42-
const request = dispatch(modelsApi.endpoints.getModelConfigs.initiate());
42+
const request = dispatch(modelsApi.endpoints.getModelConfigs.initiate(undefined, { subscribe: false }));
4343
const data = await request.unwrap();
44-
request.unsubscribe();
4544
const models = modelConfigsAdapterSelectors.selectAll(data);
4645

4746
const modelConfig = models.find((model) => model.key === currentModel.key);

invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/socketConnected.ts

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,8 @@ export const addSocketConnectedEventListener = (startAppListening: AppStartListe
2929

3030
// Bail on the recovery logic if this is the first connection - we don't need to recover anything
3131
if ($isFirstConnection.get()) {
32-
// Populate the model configs on first connection. This query cache has a 24hr timeout, so we can immediately
33-
// unsubscribe.
34-
const request = dispatch(modelsApi.endpoints.getModelConfigs.initiate());
35-
request.unsubscribe();
36-
32+
// Populate the model configs on first connection.
33+
dispatch(modelsApi.endpoints.getModelConfigs.initiate(undefined, { subscribe: false }));
3734
$isFirstConnection.set(false);
3835
return;
3936
}
@@ -61,10 +58,10 @@ export const addSocketConnectedEventListener = (startAppListening: AppStartListe
6158
const queueStatusRequest = dispatch(
6259
await queueApi.endpoints.getQueueStatus.initiate(undefined, {
6360
forceRefetch: true,
61+
subscribe: false,
6462
})
6563
);
6664
const nextQueueStatusData = await queueStatusRequest.unwrap();
67-
queueStatusRequest.unsubscribe();
6865

6966
// If the queue hasn't changed, we don't need to do anything.
7067
if (isEqual(prevQueueStatusData?.queue, nextQueueStatusData.queue)) {

0 commit comments

Comments
 (0)