From 0d9a973e79d575bbe1b926f222a88c6b47d37c45 Mon Sep 17 00:00:00 2001
From: Stephan Dilly <dilly.stephan@gmail.com>
Date: Thu, 4 Mar 2021 16:08:23 +0100
Subject: [PATCH] fix pull popup not closing after nothing arrived

---
 src/components/pull.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/pull.rs b/src/components/pull.rs
index 8c920430..08764d05 100644
--- a/src/components/pull.rs
+++ b/src/components/pull.rs
@@ -158,11 +158,11 @@ impl PullComponent {
             if let Err(err) = merge_res {
                 log::trace!("ff merge failed: {}", err);
                 self.confirm_merge(branch_compare.behind);
-            } else {
-                self.hide();
             }
         }
 
+        self.hide();
+
         Ok(())
     }