From e76cbba85e8f4ffa59e14dc2731b7546c7e59c45 Mon Sep 17 00:00:00 2001
From: bymyself <cbyrne@comfy.org>
Date: Mon, 16 Jun 2025 15:56:41 -0700
Subject: [PATCH] Fix no_workflow.webp test by using early returns

Ensure error toast displays when no valid workflow data exists in file
---
 src/scripts/app.ts | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/scripts/app.ts b/src/scripts/app.ts
index 5858a9a70..5011587f8 100644
--- a/src/scripts/app.ts
+++ b/src/scripts/app.ts
@@ -1355,27 +1355,37 @@ export class ComfyApp {
       }
     }
 
+    // Try to load workflow first
     if (metadata.workflow) {
       const workflowData = metadata.workflow()
       if (workflowData) {
         await this.loadGraphData(workflowData, true, true, fileName)
+        return
       }
-    } else if (metadata.prompt) {
+    }
+
+    // If no workflow, try prompt
+    if (metadata.prompt) {
       const promptData = metadata.prompt()
       if (promptData) {
         this.loadApiJson(promptData, fileName)
+        return
       }
-    } else if (metadata.parameters) {
-      // A1111 import
+    }
+
+    // If no workflow or prompt, try A1111 parameters
+    if (metadata.parameters) {
       useWorkflowService().beforeLoadNewGraph()
       importA1111(this.graph, metadata.parameters)
       useWorkflowService().afterLoadNewGraph(
         fileName,
         this.graph.serialize() as unknown as ComfyWorkflowJSON
       )
-    } else {
-      this.showErrorOnFileLoad(file)
+      return
     }
+
+    // No valid data found
+    this.showErrorOnFileLoad(file)
   }
 
   isApiJson(data: unknown) {