Fix crash when closing combined properties (#8016)

Author: gave92

src/Files/Views/Pages/PropertiesGeneral.xaml.cs

@@ -16,6 +16,7 @@ public PropertiesGeneral()
         {
             this.InitializeComponent();
         }
+
         public override async Task<bool> SaveChangesAsync(ListedItem item)
         {
             if (BaseProperties is DriveProperties driveProps)
@@ -54,7 +55,7 @@ public override async Task<bool> SaveChangesAsync(ListedItem item)
                     if (AppInstance.FilesystemViewModel != null && App.LibraryManager.CanCreateLibrary(newName).result)
                     {
                         var libraryPath = library.ItemPath;
-                        var renamed = await AppInstance.FilesystemHelpers.RenameAsync(new StorageFileWithPath(null, libraryPath), newName, Windows.Storage.NameCollisionOption.FailIfExists, false);
+                        var renamed = await AppInstance.FilesystemHelpers.RenameAsync(new StorageFileWithPath(null, libraryPath), $"{newName}{ShellLibraryItem.EXTENSION}", Windows.Storage.NameCollisionOption.FailIfExists, false);
                         if (renamed == Enums.ReturnResult.Success)
                         {
                             var newPath = Path.Combine(Path.GetDirectoryName(libraryPath), $"{newName}{ShellLibraryItem.EXTENSION}");
@@ -67,38 +68,34 @@ public override async Task<bool> SaveChangesAsync(ListedItem item)
                     }
                 }
             }
+            else if (BaseProperties is CombinedProperties combinedProps)
+            {
+                // Handle the visibility attribute for multiple files
+                if (AppInstance?.SlimContentPage?.ItemManipulationModel != null) // null on homepage
+                {
+                    foreach (var fileOrFolder in combinedProps.List)
+                    {
+                        await CoreApplication.MainView.DispatcherQueue.EnqueueAsync(() => UIFilesystemHelpers.SetHiddenAttributeItem(fileOrFolder, ViewModel.IsHidden, AppInstance.SlimContentPage.ItemManipulationModel));
+                    }
+                }
+                return true;
+            }
             else
             {
+                // Handle the visibility attribute for a single file
+                if (AppInstance?.SlimContentPage?.ItemManipulationModel != null) // null on homepage
+                {
+                    await CoreApplication.MainView.DispatcherQueue.EnqueueAsync(() => UIFilesystemHelpers.SetHiddenAttributeItem(item, ViewModel.IsHidden, AppInstance.SlimContentPage.ItemManipulationModel));
+                }
+
                 ViewModel.ItemName = ItemFileName.Text; // Make sure ItemName is updated
                 if (!string.IsNullOrWhiteSpace(ViewModel.ItemName) && ViewModel.OriginalItemName != ViewModel.ItemName)
                 {
                     return await CoreApplication.MainView.DispatcherQueue.EnqueueAsync(() => UIFilesystemHelpers.RenameFileItemAsync(item,
                           ViewModel.ItemName,
                           AppInstance));
                 }
-
-                // Handle the hidden attribute
-                if (BaseProperties is CombinedProperties combinedProps)
-                {
-                    // Handle each file independently
-                    if (AppInstance?.SlimContentPage?.ItemManipulationModel != null) // null on homepage
-                    {
-                        foreach (var fileOrFolder in combinedProps.List)
-                        {
-                            await CoreApplication.MainView.DispatcherQueue.EnqueueAsync(() => UIFilesystemHelpers.SetHiddenAttributeItem(fileOrFolder, ViewModel.IsHidden, AppInstance.SlimContentPage.ItemManipulationModel));
-                        }
-                    }
-                    return true;
-                }
-                else
-                {
-                    // Handle the visibility attribute for a single file
-                    if (AppInstance?.SlimContentPage?.ItemManipulationModel != null) // null on homepage
-                    {
-                        await CoreApplication.MainView.DispatcherQueue.EnqueueAsync(() => UIFilesystemHelpers.SetHiddenAttributeItem(item, ViewModel.IsHidden, AppInstance.SlimContentPage.ItemManipulationModel));
-                    }
-                    return true;
-                }
+                return true;
             }
 
             return false;