diff options
| author | Stephan Dilly <dilly.stephan@gmail.com> | 2021-03-04 16:08:23 +0100 |
|---|---|---|
| committer | Stephan Dilly <dilly.stephan@gmail.com> | 2021-03-04 16:08:23 +0100 |
| commit | 0d9a973e79d575bbe1b926f222a88c6b47d37c45 (patch) | |
| tree | e2a5957c063fc073d7c86e9baca6592ab2c386df | |
| parent | 50e3ab44e0e3dec4cf49415000714a40b8aa527f (diff) | |
fix pull popup not closing after nothing arrivedv0.12.0
| -rw-r--r-- | src/components/pull.rs | 4 |
1 files 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(()) } |