ADIX7/FileTime2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix crash with empty fullname path

Browse Source
This commit is contained in:
Ádám Kovács
2023-02-22 22:13:38 +01:00
parent 28bc479ee4
commit 3dccaa5243
8 changed files with 46 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/AppCommon/FileTime.App.Core/Services/Persistence/TabPersistenceService.cs
View File

@@ -128,7 +128,7 @@ public class TabPersistenceService : ITabPersistenceService
if (tab.Path == null) continue;
IContainer? container = null;
var path = new FullName(tab.Path);
var path = FullName.CreateSafe(tab.Path);
while (true)
{
try

6
src/AppCommon/FileTime.App.Core/ViewModels/ItemViewModel.cs
View File

@@ -67,7 +67,7 @@ public abstract partial class ItemViewModel : IItemViewModel
IsSelected = itemViewModelType is ItemViewModelType.Main
? parentTab.CurrentSelectedItem.Select(EqualsTo)
: Observable.Return(IsInDeespestPath());
: Observable.Return(IsInDeepestPath());
IsAlternative = sourceCollection.Select(c => c?.Index().FirstOrDefault(i => EqualsTo(i.Value)).Key % 2 == 0);
@@ -92,7 +92,7 @@ public abstract partial class ItemViewModel : IItemViewModel
return BaseItem?.FullName?.Path is string path && path == itemViewModel?.BaseItem?.FullName?.Path;
}
private bool IsInDeespestPath()
private bool IsInDeepestPath()
{
if (_parentTab?.Tab?.LastDeepestSelectedPath is null
|| BaseItem?.FullName is null)
@@ -102,7 +102,7 @@ public abstract partial class ItemViewModel : IItemViewModel
var ownFullName = BaseItem.FullName;
var deepestPath = _parentTab.Tab.LastDeepestSelectedPath;
var commonPath = new FullName(PathHelper.GetCommonPath(ownFullName.Path, deepestPath.Path));
var commonPath = FullName.CreateSafe(PathHelper.GetCommonPath(ownFullName.Path, deepestPath.Path));
return commonPath.Path == ownFullName.Path;
}