README.md

@@ -31,8 +31,7 @@
 [github-downloads-latest-shield]: https://img.shields.io/github/downloads/comfyanonymous/ComfyUI/latest/total?style=flat&label=downloads%40latest
 [github-downloads-link]: https://github.com/comfyanonymous/ComfyUI/releases
 
-<img width="1590" height="795" alt="ComfyUI Screenshot" src="https://github.com/user-attachments/assets/36e065e0-bfae-4456-8c7f-8369d5ea48a2" />
-<br>
+<img width="1590" height="795" alt="ComfyUI Screenshot" src="https://github.com/user-attachments/assets/4aab0bef-b413-4595-9766-a2c134676d27" />
 </div>
 
 ComfyUI is the AI creation engine for visual professionals who demand control over every model, every parameter, and every output. Its powerful and modular node graph interface empowers creatives to generate images, videos, 3D models, audio, and more...

comfy_extras/nodes_compositing.py

@@ -202,11 +202,14 @@ class JoinImageWithAlpha(io.ComfyNode):
 
     @classmethod
     def execute(cls, image: torch.Tensor, alpha: torch.Tensor) -> io.NodeOutput:
-        batch_size = max(len(image), len(alpha))
+        batch_size = min(len(image), len(alpha))
+        out_images = []
+
         alpha = 1.0 - resize_mask(alpha, image.shape[1:])
-        alpha = comfy.utils.repeat_to_batch_size(alpha, batch_size)
-        image = comfy.utils.repeat_to_batch_size(image, batch_size)
-        return io.NodeOutput(torch.cat((image[..., :3], alpha.unsqueeze(-1)), dim=-1))
+        for i in range(batch_size):
+           out_images.append(torch.cat((image[i][:,:,:3], alpha[i].unsqueeze(2)), dim=2))
+
+        return io.NodeOutput(torch.stack(out_images))
 
 
 class CompositingExtension(ComfyExtension):

node_helpers.py

@@ -86,6 +86,6 @@ def image_alpha_fix(destination, source):
     if destination.shape[-1] < source.shape[-1]:
         source = source[...,:destination.shape[-1]]
     elif destination.shape[-1] > source.shape[-1]:
-        source = torch.nn.functional.pad(source, (0, 1))
-        source[..., -1] = 1.0
+        destination = torch.nn.functional.pad(destination, (0, 1))
+        destination[..., -1] = 1.0
     return destination, source

server.py

@@ -1,4 +1,3 @@
-import errno
 import os
 import sys
 import asyncio
@@ -1246,13 +1245,7 @@ class PromptServer():
             address = addr[0]
             port = addr[1]
             site = web.TCPSite(runner, address, port, ssl_context=ssl_ctx)
-            try:
-                await site.start()
-            except OSError as e:
-                if e.errno == errno.EADDRINUSE:
-                    logging.error(f"Port {port} is already in use on address {address}. Please close the other application or use a different port with --port.")
-                    raise SystemExit(1)
-                raise
+            await site.start()
 
             if not hasattr(self, 'address'):
                 self.address = address #TODO: remove this