Skip to content

Commit 4f4e2ee

Browse files
committed
code suggestions
1 parent 5374878 commit 4f4e2ee

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

samples/features/Features.Avalonia/ViewModels/ShellViewModel.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ public void GoHome()
4444

4545
public void GoBack()
4646
{
47-
var menuVM = _container.GetInstance<MenuViewModel>();
4847
if (_navigationService != null)
4948
{
5049
_navigationService.GoBackAsync();

src/Caliburn.Micro.Platform/Platforms/netcore-avalonia/NavigationFrame.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ private void NavigateToViewModel(object viewModel, bool addToStack = true)
122122
if (addToStack)
123123
{
124124
navigationStack.Add(viewModel);
125-
navigationStackIndex = navigationStack.Count;
125+
navigationStackIndex = navigationStack.Count - 1;
126126
}
127127
}
128128

@@ -133,7 +133,7 @@ public Task GoBackAsync(bool animated = true)
133133
if (navigationStackIndex > 0)
134134
navigationStackIndex--;
135135

136-
NavigateToViewModel(navigationStack[navigationStackIndex - 1], false);
136+
NavigateToViewModel(navigationStack[navigationStackIndex], false);
137137
return Task.CompletedTask;
138138
}
139139

0 commit comments

Comments
 (0)