fix pull popup not closing after nothing arrived

extrawurst · Mar 4, 2021 · 0d9a973 · 0d9a973
1 parent 50e3ab4
commit 0d9a973
Showing 1 changed file with 2 additions and 2 deletions.
diff --git 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(())
  }