Merge pull request #1442 from ergoxiv/hotfix/file-rename-dupl-extensions

Fixed file rename causing duplicate file extensions
imchillin · Feb 2, 2025 · f546e2d · f546e2d
2 parents 2907669 + 26b392b
commit f546e2d
Showing 1 changed file with 10 additions and 8 deletions.
diff --git a/Anamnesis/Files/FileBrowserView.xaml.cs b/Anamnesis/Files/FileBrowserView.xaml.cs
@@ -3,6 +3,12 @@
 
 namespace Anamnesis.GUI.Views;
 
+using Anamnesis.Files;
+using Anamnesis.GUI.Dialogs;
+using Anamnesis.Services;
+using Anamnesis.Styles.Drawers;
+using PropertyChanged;
+using Serilog;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
@@ -14,12 +20,6 @@ namespace Anamnesis.GUI.Views;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
-using Anamnesis.Files;
-using Anamnesis.GUI.Dialogs;
-using Anamnesis.Services;
-using Anamnesis.Styles.Drawers;
-using PropertyChanged;
-using Serilog;
 using XivToolsWpf;
 
 public abstract class FileBrowserDrawer : SelectorDrawer<FileBrowserView.EntryWrapper>
@@ -504,7 +504,7 @@ private async void OnDeleteClick(object sender, RoutedEventArgs e)
 			return;
 
 		var entry = this.Selected.Entry;
-		if(entry is DirectoryInfo directory)
+		if (entry is DirectoryInfo directory)
 		{
 			directory.Delete(true);
 		}
@@ -672,7 +672,9 @@ public string? Rename
 						if (this.Entry is FileInfo file)
 						{
 							string? extension = Path.GetExtension(this.Entry.FullName);
-							newPath += extension;
+							if (!newPath.EndsWith(extension, StringComparison.OrdinalIgnoreCase))
+								newPath += extension;
+
 							file.MoveTo(newPath);
 						}
 						else if (this.Entry is DirectoryInfo dir)