Fix potential NullReferenceException (win)

toggl-open-source · Mar 5, 2020 · 9f53cd9 · 9f53cd9
1 parent 413d1bb
commit 9f53cd9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/ui/windows/TogglDesktop/TogglDesktop/ui/controls/MiniTimer.xaml.cs b/src/ui/windows/TogglDesktop/TogglDesktop/ui/controls/MiniTimer.xaml.cs
@@ -107,7 +107,7 @@ private void onGridKeyDown(object sender, KeyEventArgs e)
                 }
                 case Key.Escape:
                 {
-                    if (this.isRunning || this.editModeProjectLabel.ViewModel.HasProject == false)
+                    if (this.isRunning || this.editModeProjectLabel.ViewModel?.HasProject != true)
                         return;
                     this.clearSelectedProject();
                     e.Handled = true;

diff --git a/src/ui/windows/TogglDesktop/TogglDesktop/ui/views/Timer.xaml.cs b/src/ui/windows/TogglDesktop/TogglDesktop/ui/views/Timer.xaml.cs
@@ -123,7 +123,7 @@ private void onGridKeyDown(object sender, KeyEventArgs e)
                 }
                 case Key.Escape:
                 {
-                    if (this.isRunning || this.editModeProjectLabel.ViewModel.HasProject == false)
+                    if (this.isRunning || this.editModeProjectLabel.ViewModel?.HasProject != true)
                         return;
                     this.clearSelectedProject();
                     e.Handled = true;