From 27e2915cb3d8f2c8abeb36c1c91d1b56bde092de Mon Sep 17 00:00:00 2001 From: Sebastian Malton Date: Mon, 19 Sep 2022 10:53:08 -0400 Subject: [PATCH] Fix init timing for DefaultUpdateChannel Signed-off-by: Sebastian Malton --- .../default-update-channel.injectable.ts | 2 +- .../check-for-updates/update-can-be-downgraded.injectable.ts | 2 +- src/main/vars/default-update-channel/init.injectable.ts | 4 ++-- src/renderer/vars/default-update-channel/init.injectable.ts | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/common/application-update/selected-update-channel/default-update-channel.injectable.ts b/src/common/application-update/selected-update-channel/default-update-channel.injectable.ts index ff4fe32e4e..9c00efa204 100644 --- a/src/common/application-update/selected-update-channel/default-update-channel.injectable.ts +++ b/src/common/application-update/selected-update-channel/default-update-channel.injectable.ts @@ -8,7 +8,7 @@ import { updateChannels } from "../update-channels"; const defaultUpdateChannelInjectable = createInitializableState({ id: "default-update-channel", - init: (di) => updateChannels[di.inject(releaseChannelInjectable)], + init: (di) => updateChannels[di.inject(releaseChannelInjectable).get()], }); export default defaultUpdateChannelInjectable; diff --git a/src/main/application-update/check-for-updates/update-can-be-downgraded.injectable.ts b/src/main/application-update/check-for-updates/update-can-be-downgraded.injectable.ts index aa8fb1b131..b5bdfe2cba 100644 --- a/src/main/application-update/check-for-updates/update-can-be-downgraded.injectable.ts +++ b/src/main/application-update/check-for-updates/update-can-be-downgraded.injectable.ts @@ -16,7 +16,7 @@ const updateCanBeDowngradedInjectable = getInjectable({ return computed(() => ( selectedUpdateChannel.value.get().id === "latest" - && releaseChannel !== "latest" + && releaseChannel.get() !== "latest" )); }, }); diff --git a/src/main/vars/default-update-channel/init.injectable.ts b/src/main/vars/default-update-channel/init.injectable.ts index e63b12bac1..e1680efa39 100644 --- a/src/main/vars/default-update-channel/init.injectable.ts +++ b/src/main/vars/default-update-channel/init.injectable.ts @@ -4,8 +4,8 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import defaultUpdateChannelInjectable from "../../../common/application-update/selected-update-channel/default-update-channel.injectable"; -import initSemanticBuildVersionInjectable from "../../../renderer/vars/semantic-build-version/init.injectable"; import { beforeApplicationIsLoadingInjectionToken } from "../../start-main-application/runnable-tokens/before-application-is-loading-injection-token"; +import initReleaseChannelInjectable from "../release-channel/init.injectable"; const initDefaultUpdateChannelInjectableInjectable = getInjectable({ id: "init-default-update-channel-injectable", @@ -14,7 +14,7 @@ const initDefaultUpdateChannelInjectableInjectable = getInjectable({ return { run: () => defaultUpdateChannel.init(), - runAfter: di.inject(initSemanticBuildVersionInjectable), + runAfter: di.inject(initReleaseChannelInjectable), }; }, injectionToken: beforeApplicationIsLoadingInjectionToken, diff --git a/src/renderer/vars/default-update-channel/init.injectable.ts b/src/renderer/vars/default-update-channel/init.injectable.ts index fb737c766b..e486be0aaf 100644 --- a/src/renderer/vars/default-update-channel/init.injectable.ts +++ b/src/renderer/vars/default-update-channel/init.injectable.ts @@ -4,8 +4,8 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import defaultUpdateChannelInjectable from "../../../common/application-update/selected-update-channel/default-update-channel.injectable"; -import initSemanticBuildVersionInjectable from "../../../renderer/vars/semantic-build-version/init.injectable"; import { beforeFrameStartsInjectionToken } from "../../before-frame-starts/before-frame-starts-injection-token"; +import initReleaseChannelInjectable from "../release-channel/init.injectable"; const initDefaultUpdateChannelInjectableInjectable = getInjectable({ id: "init-default-update-channel-injectable", @@ -14,7 +14,7 @@ const initDefaultUpdateChannelInjectableInjectable = getInjectable({ return { run: () => defaultUpdateChannel.init(), - runAfter: di.inject(initSemanticBuildVersionInjectable), + runAfter: di.inject(initReleaseChannelInjectable), }; }, injectionToken: beforeFrameStartsInjectionToken,