From 2cb568773c9e6530807d94463974680663c50661 Mon Sep 17 00:00:00 2001
From: David Montesinos <90258222+mdmontesinos@users.noreply.github.com>
Date: Tue, 23 Sep 2025 16:21:20 +0200
Subject: [PATCH] Restore order of SetImage in FileManager

Fixes #5648
---
 Oqtane.Client/Modules/Controls/FileManager.razor | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/Oqtane.Client/Modules/Controls/FileManager.razor b/Oqtane.Client/Modules/Controls/FileManager.razor
index c3ac1846..4bd49824 100644
--- a/Oqtane.Client/Modules/Controls/FileManager.razor
+++ b/Oqtane.Client/Modules/Controls/FileManager.razor
@@ -345,11 +345,11 @@
         try
         {
             FolderId = int.Parse((string)e.Value);
-            await OnSelectFolder.InvokeAsync(FolderId);
             FileId = -1;
             GetFolderPermission();
             await SetImage();
             await GetFiles();
+            await OnSelectFolder.InvokeAsync(FolderId);
             StateHasChanged();
         }
         catch (Exception ex)
@@ -364,11 +364,11 @@
     {
         _message = string.Empty;
         FileId = int.Parse((string)e.Value);
+        await SetImage();
     #pragma warning disable CS0618
         await OnSelect.InvokeAsync(FileId);
     #pragma warning restore CS0618
         await OnSelectFile.InvokeAsync(FileId);
-        await SetImage();
         StateHasChanged();
     }
 
@@ -460,13 +460,14 @@
                             }
                         }
 
+                        await SetImage();
+
                         await OnUpload.InvokeAsync(FileId);
 #pragma warning disable CS0618
                         await OnSelect.InvokeAsync(FileId);
 #pragma warning restore CS0618
                         await OnSelectFile.InvokeAsync(FileId);
 
-                        await SetImage();
                         await GetFiles();
                         StateHasChanged();
                     }
@@ -518,12 +519,13 @@
             }
 
             FileId = -1;
+            await SetImage();
+
 #pragma warning disable CS0618
             await OnSelect.InvokeAsync(FileId);
 #pragma warning restore CS0618
             await OnSelectFile.InvokeAsync(FileId);
 
-            await SetImage();
             await GetFiles();
             StateHasChanged();
         }