Skip to content

Commit 0d9a973

Browse files
author
Stephan Dilly
committed
fix pull popup not closing after nothing arrived
1 parent 50e3ab4 commit 0d9a973

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

src/components/pull.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,11 +158,11 @@ impl PullComponent {
158158
if let Err(err) = merge_res {
159159
log::trace!("ff merge failed: {}", err);
160160
self.confirm_merge(branch_compare.behind);
161-
} else {
162-
self.hide();
163161
}
164162
}
165163

164+
self.hide();
165+
166166
Ok(())
167167
}
168168

0 commit comments

Comments
 (0)