From 974236ce5a9099be879da39544be59c87def7cba Mon Sep 17 00:00:00 2001
From: Christian Byrne <cbyrne@comfy.org>
Date: Sat, 10 May 2025 13:03:55 -0700
Subject: [PATCH] Fix video previews not displayed if VHS previously installed
 but disabled or uninstalled (#3844)

---
 src/components/sidebar/tabs/queue/ResultVideo.vue | 14 +++++++++++---
 src/schemas/apiSchema.ts                          |  2 +-
 src/stores/extensionStore.ts                      |  3 +++
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/components/sidebar/tabs/queue/ResultVideo.vue b/src/components/sidebar/tabs/queue/ResultVideo.vue
index 471175925c..776165c7bc 100644
--- a/src/components/sidebar/tabs/queue/ResultVideo.vue
+++ b/src/components/sidebar/tabs/queue/ResultVideo.vue
@@ -8,6 +8,7 @@
 <script setup lang="ts">
 import { computed } from 'vue'
 
+import { useExtensionStore } from '@/stores/extensionStore'
 import { ResultItemImpl } from '@/stores/queueStore'
 import { useSettingStore } from '@/stores/settingStore'
 
@@ -16,9 +17,16 @@ const props = defineProps<{
 }>()
 
 const settingStore = useSettingStore()
-const vhsAdvancedPreviews = computed(() =>
-  settingStore.get('VHS.AdvancedPreviews')
-)
+const { isExtensionInstalled, isExtensionEnabled } = useExtensionStore()
+
+const vhsAdvancedPreviews = computed(() => {
+  return (
+    isExtensionInstalled('VideoHelperSuite.Core') &&
+    isExtensionEnabled('VideoHelperSuite.Core') &&
+    settingStore.get('VHS.AdvancedPreviews') &&
+    settingStore.get('VHS.AdvancedPreviews') !== 'Never'
+  )
+})
 
 const url = computed(() =>
   vhsAdvancedPreviews.value
diff --git a/src/schemas/apiSchema.ts b/src/schemas/apiSchema.ts
index c6419ad483..f94f91c3d8 100644
--- a/src/schemas/apiSchema.ts
+++ b/src/schemas/apiSchema.ts
@@ -451,7 +451,7 @@ const zSettings = z.object({
   'Comfy.Load3D.CameraType': z.enum(['perspective', 'orthographic']),
   'pysssss.SnapToGrid': z.boolean(),
   /** VHS setting is used for queue video preview support. */
-  'VHS.AdvancedPreviews': z.boolean(),
+  'VHS.AdvancedPreviews': z.string(),
   /** Settings used for testing */
   'test.setting': z.any(),
   'main.sub.setting.name': z.any(),
diff --git a/src/stores/extensionStore.ts b/src/stores/extensionStore.ts
index 302110b108..0ba23846d0 100644
--- a/src/stores/extensionStore.ts
+++ b/src/stores/extensionStore.ts
@@ -36,6 +36,8 @@ export const useExtensionStore = defineStore('extension', () => {
     )
   })
 
+  const isExtensionInstalled = (name: string) => name in extensionByName.value
+
   const isExtensionEnabled = (name: string) =>
     !disabledExtensionNames.value.has(name)
   const enabledExtensions = computed(() => {
@@ -96,6 +98,7 @@ export const useExtensionStore = defineStore('extension', () => {
     extensions,
     enabledExtensions,
     inactiveDisabledExtensionNames,
+    isExtensionInstalled,
     isExtensionEnabled,
     isExtensionReadOnly,
     registerExtension,