From c36c0c4ef74b30adf16e2e5af4f677f403425a39 Mon Sep 17 00:00:00 2001
From: automated-signal <37887102+automated-signal@users.noreply.github.com>
Date: Fri, 26 Sep 2025 15:26:13 -0500
Subject: [PATCH] Improve getUnusedFilename parsing

Co-authored-by: Fedor Indutny <79877362+indutny-signal@users.noreply.github.com>
---
 ts/windows/main/attachments.ts | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/ts/windows/main/attachments.ts b/ts/windows/main/attachments.ts
index 5c2446ac833..8847d193e91 100644
--- a/ts/windows/main/attachments.ts
+++ b/ts/windows/main/attachments.ts
@@ -291,11 +291,12 @@ export const getUnusedFilename = ({
   filename: string;
   baseDir?: string;
 }): string => {
-  if (baseDir == null || !existsSync(join(baseDir, filename))) {
-    return filename;
+  const { ext, name: mainFilename, base } = pathParse(filename);
+
+  if (baseDir == null || !existsSync(join(baseDir, base))) {
+    return base;
   }
 
-  const { ext, name: mainFilename } = pathParse(filename);
   for (let n = 1; n < GET_UNUSED_FILENAME_MAX_ATTEMPTS; n += 1) {
     const nextFilename = `${mainFilename}-${n}${ext}`;
     if (!existsSync(join(baseDir, nextFilename))) {