Skip to content

Commit cc44d76

Browse files
author
Manuel Ullmann
committed
FirewallView: Make ViewModel initialization null safe.
Signed-off-by: Manuel Ullmann <manuel.ullmann@rediecon.com>
1 parent e78e03a commit cc44d76

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

Source/NETworkManager/Views/FirewallView.xaml.cs

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
using System.Windows;
1+
using System;
2+
using System.Windows;
23
using System.Windows.Controls;
34
using NETworkManager.ViewModels;
45

@@ -21,7 +22,8 @@ public FirewallView()
2122
{
2223
InitializeComponent();
2324

24-
_viewModel = FirewallViewModel.Instance as FirewallViewModel;
25+
_viewModel = FirewallViewModel.Instance as FirewallViewModel
26+
?? throw new ArgumentNullException(nameof(FirewallViewModel));
2527
DataContext = _viewModel;
2628
_viewModel?.CommandExecuted += AnyButton_OnClick;
2729
FirewallRuleGrid.DataContext = _viewModel;
@@ -44,8 +46,8 @@ private void ContextMenu_Opened(object sender, RoutedEventArgs e)
4446
/// </summary>
4547
public void OnViewHide()
4648
{
47-
_viewModel.OnViewHide();
48-
if (_viewModel.IsViewActive)
49+
_viewModel?.OnViewHide();
50+
if (_viewModel?.IsViewActive ?? false)
4951
FirewallRuleGrid?.RestoreRuleGridFocus();
5052
}
5153

@@ -54,7 +56,7 @@ public void OnViewHide()
5456
/// </summary>
5557
public void OnViewVisible()
5658
{
57-
_viewModel.OnViewVisible();
59+
_viewModel?.OnViewVisible();
5860
FirewallRuleGrid?.RestoreRuleGridFocus();
5961
}
6062

0 commit comments

Comments
 (0)