Fix file watcher and order files on new item (#2443)

Author: gave92

Files/View Models/ItemViewModel.cs

@@ -1379,18 +1379,27 @@ private async Task AddFileOrFolderAsync(string fileOrFolderPath, string dateRetu
                                                   additionalFlags);
             FindClose(hFile);
 
-            await CoreApplication.MainView.ExecuteOnUIThreadAsync(async () =>
+            ListedItem listedItem = null;
+            if ((findData.dwFileAttributes & 0x10) > 0) // FILE_ATTRIBUTE_DIRECTORY
             {
-                if ((findData.dwFileAttributes & 0x10) > 0) // FILE_ATTRIBUTE_DIRECTORY
-                {
-                    AddFolder(findData, Directory.GetParent(fileOrFolderPath).FullName, dateReturnFormat);
-                }
-                else
+                listedItem = AddFolder(findData, Directory.GetParent(fileOrFolderPath).FullName, dateReturnFormat);
+            }
+            else
+            {
+                listedItem = await AddFile(findData, Directory.GetParent(fileOrFolderPath).FullName, dateReturnFormat);
+            }
+
+            if (listedItem != null)
+            {
+                var tempList = _filesAndFolders.ToList();
+                tempList.Add(listedItem);
+                var orderedList = OrderFiles2(tempList);
+                await CoreApplication.MainView.ExecuteOnUIThreadAsync(() =>
                 {
-                    await AddFile(findData, Directory.GetParent(fileOrFolderPath).FullName, dateReturnFormat);
-                }
-                UpdateDirectoryInfo();
-            });
+                    OrderFiles(orderedList);
+                    UpdateDirectoryInfo();
+                });
+            }
         }
 
         private void UpdateDirectoryInfo()