From cbafee7ee3d01dc9648be3df401bb7a243a05c52 Mon Sep 17 00:00:00 2001
From: swdevsmz <duke2per@gmail.com>
Date: Sat, 12 Oct 2024 22:54:35 +0900
Subject: [PATCH] =?UTF-8?q?=E3=82=B7=E3=83=BC=E3=82=B1=E3=83=B3=E3=82=B9?=
 =?UTF-8?q?=E3=81=AE=E7=AE=A1=E7=90=86=E6=96=B9=E6=B3=95=E3=82=92=E3=82=B0?=
 =?UTF-8?q?=E3=83=AD=E3=83=BC=E3=83=90=E3=83=AB=E5=A4=89=E6=95=B0=E3=81=8B?=
 =?UTF-8?q?=E3=82=89=E3=83=87=E3=82=A3=E3=83=AC=E3=82=AF=E3=83=88=E3=83=AA?=
 =?UTF-8?q?=E5=86=85=E3=81=AE=E3=83=95=E3=82=A1=E3=82=A4=E3=83=AB=E9=80=A3?=
 =?UTF-8?q?=E7=95=AA=E3=81=AE=E6=9C=80=E5=A4=A7=E3=82=92=E5=8F=96=E5=BE=97?=
 =?UTF-8?q?=E3=81=99=E3=82=8B=E6=96=B9=E6=B3=95=E4=BA=8C=E5=A4=89=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Greenshot.Base/Core/FilenameHelper.cs | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/Greenshot.Base/Core/FilenameHelper.cs b/src/Greenshot.Base/Core/FilenameHelper.cs
index 4c6864547..7b15645dd 100644
--- a/src/Greenshot.Base/Core/FilenameHelper.cs
+++ b/src/Greenshot.Base/Core/FilenameHelper.cs
@@ -23,6 +23,7 @@ using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 using System.Text.RegularExpressions;
 using System.Windows.Forms;
 using Greenshot.Base.Core.Enums;
@@ -421,8 +422,16 @@ namespace Greenshot.Base.Core
                         break;
                     case "NUM":
                         CoreConfig.OutputFileIncrementingNumber++;
+                        var maxNumber = Directory.GetFiles(CoreConfig.OutputFilePath)
+                                                 .Select(Path.GetFileNameWithoutExtension)
+                                                 // 連番を抽出するための正規表現
+                                                 .Select(filename => new Regex(@"\d+").Match(filename))
+                                                 .Where(match => match.Success)
+                                                 .Select(match => int.Parse(match.Value))
+                                                 .DefaultIfEmpty(0)
+                                                 .Max() + 1;
                         IniConfig.Save();
-                        replaceValue = CoreConfig.OutputFileIncrementingNumber.ToString();
+                        replaceValue = maxNumber.ToString();
                         if (padWidth == 0)
                         {
                             padWidth = -6;