From c168960a12213df8123a2f234f04a4cf55bbe30d Mon Sep 17 00:00:00 2001
From: comfyanonymous <121283862+comfyanonymous@users.noreply.github.com>
Date: Tue, 5 May 2026 17:00:11 -0700
Subject: [PATCH] First step of supporting save filenames without trailing _
 (#13722)

get_save_image_path now properly supports filenames without
trailing underscores.

This will be the saving behavior when using a mix of save image nodes using the old and the new format.

ComfyUI_00001_.png
ComfyUI_00002.png
ComfyUI_00003.png
ComfyUI_00004_.png
---
 folder_paths.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/folder_paths.py b/folder_paths.py
index 80f4b291a..039f72636 100644
--- a/folder_paths.py
+++ b/folder_paths.py
@@ -432,7 +432,9 @@ def get_save_image_path(filename_prefix: str, output_dir: str, image_width=0, im
         prefix_len = len(os.path.basename(filename_prefix))
         prefix = filename[:prefix_len + 1]
         try:
-            digits = int(filename[prefix_len + 1:].split('_')[0])
+            remainder = filename[prefix_len + 1:]
+            base_remainder = remainder.split('.')[0]
+            digits = int(base_remainder.split('_')[0])
         except:
             digits = 0
         return digits, prefix