aboutsummaryrefslogtreecommitdiff
path: root/src/app
diff options
context:
space:
mode:
Diffstat (limited to 'src/app')
-rw-r--r--src/app/input/modal.rs5
-rw-r--r--src/app/input/sidebar.rs1
2 files changed, 5 insertions, 1 deletions
diff --git a/src/app/input/modal.rs b/src/app/input/modal.rs
index 2ba9b6f4..fe909326 100644
--- a/src/app/input/modal.rs
+++ b/src/app/input/modal.rs
@@ -121,7 +121,10 @@ pub(super) fn request_quit_or_detach(state: &mut AppState) {
pub(super) fn apply_global_menu_action(state: &mut AppState, action: GlobalMenuAction) {
match action {
- GlobalMenuAction::Quit => request_quit_or_detach(state),
+ GlobalMenuAction::Quit => {
+ leave_modal(state);
+ request_quit_or_detach(state);
+ }
GlobalMenuAction::WhatsNew => open_update_release_notes(state),
GlobalMenuAction::Keybinds => open_keybind_help(state),
GlobalMenuAction::ReloadKeybinds => {
diff --git a/src/app/input/sidebar.rs b/src/app/input/sidebar.rs
index 34845861..9de8868b 100644
--- a/src/app/input/sidebar.rs
+++ b/src/app/input/sidebar.rs
@@ -602,6 +602,7 @@ mod tests {
assert!(app.state.detach_requested);
assert!(!app.state.should_quit);
+ assert_ne!(app.state.mode, Mode::GlobalMenu);
}
#[test]