浏览代码

Don't reload filelist if unable to navigate #196

Ruben 6 月之前
父节点
当前提交
52d1718fdb
共有 1 个文件被更改,包括 10 次插入2 次删除
  1. 10 2
      src/PicView.Avalonia/SettingsManagement/SettingsUpdater.cs

+ 10 - 2
src/PicView.Avalonia/SettingsManagement/SettingsUpdater.cs

@@ -122,6 +122,11 @@ public static class SettingsUpdater
     {
     {
         vm.IsIncludingSubdirectories = false;
         vm.IsIncludingSubdirectories = false;
         Settings.Sorting.IncludeSubDirectories = false;
         Settings.Sorting.IncludeSubDirectories = false;
+
+        if (!NavigationManager.CanNavigate(vm))
+        {
+            return;
+        }
         
         
         await NavigationManager.ReloadFileListAsync().ConfigureAwait(false);
         await NavigationManager.ReloadFileListAsync().ConfigureAwait(false);
         TitleManager.SetTitle(vm);
         TitleManager.SetTitle(vm);
@@ -132,6 +137,11 @@ public static class SettingsUpdater
         vm.IsIncludingSubdirectories = true;
         vm.IsIncludingSubdirectories = true;
         Settings.Sorting.IncludeSubDirectories = true;
         Settings.Sorting.IncludeSubDirectories = true;
         
         
+        if (!NavigationManager.CanNavigate(vm))
+        {
+            return;
+        }
+        
         await NavigationManager.ReloadFileListAsync().ConfigureAwait(false);
         await NavigationManager.ReloadFileListAsync().ConfigureAwait(false);
         TitleManager.SetTitle(vm);
         TitleManager.SetTitle(vm);
     }
     }
@@ -330,8 +340,6 @@ public static class SettingsUpdater
         vm.ChangeCtrlZoomImage = scanEyeImage as DrawingImage;
         vm.ChangeCtrlZoomImage = scanEyeImage as DrawingImage;
     }
     }
     
     
-    
-    
     public static async Task ToggleLooping(MainViewModel vm)
     public static async Task ToggleLooping(MainViewModel vm)
     {
     {
         if (vm is null)
         if (vm is null)