From 2d7ea561e2662efa0928cf338f7316d880c946da Mon Sep 17 00:00:00 2001
From: yindf <112849074+yindf@users.noreply.github.com>
Date: Wed, 30 Oct 2024 17:59:14 +0800
Subject: [PATCH] fix bug that stuck auto fetch when pull failed & make stage
 area resizeable (#627)

* fix watcher stuck by pull
* make stage area resizeable

---------

Co-authored-by: yindf <yindf@mail.jj.cn>
(cherry picked from commit a842aca042a73cb5fa3995794aae2a2e3540b37f)
---
 src/ViewModels/Pull.cs      | 3 +++
 src/Views/WorkingCopy.axaml | 9 +++++++++
 2 files changed, 12 insertions(+)

diff --git a/src/ViewModels/Pull.cs b/src/ViewModels/Pull.cs
index fdaad920..b5c038ae 100644
--- a/src/ViewModels/Pull.cs
+++ b/src/ViewModels/Pull.cs
@@ -149,7 +149,10 @@ namespace SourceGit.ViewModels
                     SetProgressDescription($"Fetching remote: {_selectedRemote.Name}...");
                     rs = new Commands.Fetch(_repo.FullPath, _selectedRemote.Name, NoTags, SetProgressDescription).Exec();
                     if (!rs)
+                    {
+                        CallUIThread(() => _repo.SetWatcherEnabled(true));
                         return false;
+                    }
 
                     _repo.MarkFetched();
 
diff --git a/src/Views/WorkingCopy.axaml b/src/Views/WorkingCopy.axaml
index dae1f886..2e07d970 100644
--- a/src/Views/WorkingCopy.axaml
+++ b/src/Views/WorkingCopy.axaml
@@ -80,6 +80,15 @@
                               ChangeDoubleTapped="OnUnstagedChangeDoubleTapped"
                               KeyDown="OnUnstagedKeyDown"/>
 
+
+      <!-- Splitter -->
+      <GridSplitter Grid.Row="2"
+                    MinWidth="1"
+                    HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
+                    Background="Transparent"
+                    BorderThickness="0,0,1,0"
+                    BorderBrush="{DynamicResource Brush.Border0}"/>
+
       <!-- Staged Toolbar -->
       <Border Grid.Row="2" BorderThickness="0,1" BorderBrush="{DynamicResource Brush.Border0}">
         <Grid ColumnDefinitions="Auto,Auto,Auto,Auto,*,Auto,Auto,Auto">