Improve reloading

Ruben2776 · Nov 8, 2024 · 23ad33f · 23ad33f
1 parent 0e12b8d
commit 23ad33f
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/src/PicView.Avalonia/Navigation/ErrorHandling.cs b/src/PicView.Avalonia/Navigation/ErrorHandling.cs
@@ -73,24 +73,24 @@ await Dispatcher.UIThread.InvokeAsync(() =>
             return;
         }
 
-        vm.ImageIterator?.Clear();
-
         if (!NavigationHelper.CanNavigate(vm))
         {
             await FileHistoryNavigation.OpenLastFileAsync(vm);
             return;
         }
 
-        if (File.Exists(vm.FileInfo.FullName))
-        {
-            await NavigationHelper.LoadPicFromStringAsync(vm.FileInfo.FullName, vm);
-        }
-        else
+        if (vm.ImageIterator is null)
         {
             await Dispatcher.UIThread.InvokeAsync(() =>
             {
                 ShowStartUpMenu(vm);
             });
+            return;
         }
+
+        vm.ImageIterator.Clear();
+        await vm.ImageIterator.ReloadFileList().ConfigureAwait(false);
+        var index = vm.ImageIterator.ImagePaths.IndexOf(vm.FileInfo.FullName);
+        await vm.ImageIterator.IterateToIndex(index).ConfigureAwait(false);
     }
 }