@@ -53,6 +53,7 @@ private void Fetch(object _, RoutedEventArgs e)
53
53
if ( ! startDirectly && OperatingSystem . IsMacOS ( ) )
54
54
startDirectly = launcher . HasKeyModifier ( KeyModifiers . Meta ) ;
55
55
56
+ launcher . ClearKeyModifier ( ) ;
56
57
repo . Fetch ( startDirectly ) ;
57
58
e . Handled = true ;
58
59
}
@@ -67,6 +68,7 @@ private void Pull(object _, RoutedEventArgs e)
67
68
if ( ! startDirectly && OperatingSystem . IsMacOS ( ) )
68
69
startDirectly = launcher . HasKeyModifier ( KeyModifiers . Meta ) ;
69
70
71
+ launcher . ClearKeyModifier ( ) ;
70
72
repo . Pull ( startDirectly ) ;
71
73
e . Handled = true ;
72
74
}
@@ -81,6 +83,7 @@ private void Push(object _, RoutedEventArgs e)
81
83
if ( ! startDirectly && OperatingSystem . IsMacOS ( ) )
82
84
startDirectly = launcher . HasKeyModifier ( KeyModifiers . Meta ) ;
83
85
86
+ launcher . ClearKeyModifier ( ) ;
84
87
repo . Push ( startDirectly ) ;
85
88
e . Handled = true ;
86
89
}
@@ -89,8 +92,16 @@ private void Push(object _, RoutedEventArgs e)
89
92
private void StashAll ( object _ , RoutedEventArgs e )
90
93
{
91
94
var launcher = this . FindAncestorOfType < Launcher > ( ) ;
92
- ( DataContext as ViewModels . Repository ) ? . StashAll ( launcher ? . HasKeyModifier ( KeyModifiers . Control ) ?? false ) ;
93
- e . Handled = true ;
95
+ if ( launcher is not null && DataContext is ViewModels . Repository repo )
96
+ {
97
+ var startDirectly = launcher . HasKeyModifier ( KeyModifiers . Control ) ;
98
+ if ( ! startDirectly && OperatingSystem . IsMacOS ( ) )
99
+ startDirectly = launcher . HasKeyModifier ( KeyModifiers . Meta ) ;
100
+
101
+ launcher . ClearKeyModifier ( ) ;
102
+ repo . StashAll ( startDirectly ) ;
103
+ e . Handled = true ;
104
+ }
94
105
}
95
106
96
107
private void OpenGitFlowMenu ( object sender , RoutedEventArgs e )
0 commit comments