Fix: Fixed issue where Git buttons were incorrectly shown in the stat…

…us bar (#12703)
files-community · Jun 23, 2023 · 682bd3c · 682bd3c
1 parent 342b761
commit 682bd3c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/Files.App/UserControls/StatusBarControl.xaml b/src/Files.App/UserControls/StatusBarControl.xaml
@@ -143,7 +143,7 @@
 			x:Name="GitActionsPanel"
 			Grid.Column="1"
 			VerticalAlignment="Center"
-			x:Load="{x:Bind DirectoryPropertiesViewModel.GitBranchDisplayName, Mode=OneWay, Converter={StaticResource NullToFalseConverter}}"
+			x:Load="{x:Bind DirectoryPropertiesViewModel.GitBranchDisplayName, Mode=OneWay, Converter={StaticResource NullToFalseConverter}, FallbackValue=False}"
 			Orientation="Horizontal"
 			Spacing="4">
 
@@ -214,7 +214,7 @@
 			Background="Transparent"
 			BorderBrush="Transparent"
 			ToolTipService.ToolTip="{helpers:ResourceString Name=ManageBranches}"
-			Visibility="{x:Bind DirectoryPropertiesViewModel.GitBranchDisplayName, Mode=OneWay, Converter={StaticResource NullToVisibilityCollapsedConverter}}">
+			Visibility="{x:Bind DirectoryPropertiesViewModel.GitBranchDisplayName, Mode=OneWay, Converter={StaticResource NullToVisibilityCollapsedConverter}, FallbackValue=Collapsed}">
 
 			<Button.Content>
 				<StackPanel Orientation="Horizontal" Spacing="8">

diff --git a/src/Files.App/UserControls/StatusBarControl.xaml.cs b/src/Files.App/UserControls/StatusBarControl.xaml.cs
@@ -11,7 +11,7 @@ public sealed partial class StatusBarControl : UserControl
 	{
 		public ICommandManager Commands { get; } = Ioc.Default.GetRequiredService<ICommandManager>();
 
-		public DirectoryPropertiesViewModel DirectoryPropertiesViewModel
+		public DirectoryPropertiesViewModel? DirectoryPropertiesViewModel
 		{
 			get => (DirectoryPropertiesViewModel)GetValue(DirectoryPropertiesViewModelProperty);
 			set => SetValue(DirectoryPropertiesViewModelProperty, value);
@@ -47,6 +47,9 @@ public StatusBarControl()
 
 		private void BranchesFlyout_Opening(object sender, object e)
 		{
+			if (DirectoryPropertiesViewModel is null)
+				return;
+
 			DirectoryPropertiesViewModel.ShowLocals = true;
 			DirectoryPropertiesViewModel.SelectedBranchIndex = DirectoryPropertiesViewModel.ACTIVE_BRANCH_INDEX;
 		}