QuitApplication now respects window_close_confirmation

closes: #398 closes: #280
wez · Dec 26, 2020 · 586d18c · 586d18c
1 parent b3ac77a
commit 586d18c
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 9 deletions.
diff --git a/docs/changelog.markdown b/docs/changelog.markdown
@@ -30,7 +30,7 @@ brief notes about them may accumulate here.
 * The 256 color cube now uses slightly brighter colors [#348](https://github.com/wez/wezterm/issues/348)
 * New: added `line_height` configuration option to scale the computed cell height. The default is `1.0`, resulting in using the font-specified metrics. Setting it to `1.2` will result in a 20% larger cell height.
 * macOS: Fixed an issue where hovering over the split between panes could result in wezterm becoming unresponsive [#391](https://github.com/wez/wezterm/issues/391)
-* Closing windows will now prompt for confirmation before proceeding with the close.  Added `window_close_confirmation` to control this; valid values are `AlwaysPrompt` and `NeverPrompt`. [#280](https://github.com/wez/wezterm/issues/280)
+* Closing windows and `QuitApplication` will now prompt for confirmation before proceeding with the close/quit.  Added `window_close_confirmation` to control this; valid values are `AlwaysPrompt` and `NeverPrompt`. [#280](https://github.com/wez/wezterm/issues/280)
 * Tidied up logging. Previously ERROR level logging was used to make sure that informational things showed up in the stderr stream. Now we use INFO level logging for this to avoid alarming the user.  You can set `WEZTERM_LOG=trace` in the environment to get more verbose logging for troubleshooting purposes.
 * Windows: fix an issue where VNC-server-emulated AltGr was not treated as AltGr [#392](https://github.com/wez/wezterm/issues/392)
 * X11: fix an issue where keys that produce unicode characters retained SHIFT as a modifier instead of normalizing it away. [#394](https://github.com/wez/wezterm/issues/394)

diff --git a/wezterm-gui/src/gui/termwindow.rs b/wezterm-gui/src/gui/termwindow.rs
@@ -1974,15 +1974,26 @@ impl TermWindow {
             }
             QuitApplication => {
                 let mux = Mux::get().unwrap();
-                let tab = match mux.get_active_tab_for_window(self.mux_window_id) {
-                    Some(tab) => tab,
-                    None => anyhow::bail!("no active tab!?"),
-                };
+                let config = configuration();
 
-                let (overlay, future) =
-                    start_overlay(self, &tab, move |_tab_id, term| confirm_quit_program(term));
-                self.assign_overlay(tab.tab_id(), overlay);
-                promise::spawn::spawn(future).detach();
+                match config.window_close_confirmation {
+                    WindowCloseConfirmation::NeverPrompt => {
+                        let con = Connection::get().expect("call on gui thread");
+                        con.terminate_message_loop();
+                    }
+                    WindowCloseConfirmation::AlwaysPrompt => {
+                        let tab = match mux.get_active_tab_for_window(self.mux_window_id) {
+                            Some(tab) => tab,
+                            None => anyhow::bail!("no active tab!?"),
+                        };
+
+                        let (overlay, future) = start_overlay(self, &tab, move |_tab_id, term| {
+                            confirm_quit_program(term)
+                        });
+                        self.assign_overlay(tab.tab_id(), overlay);
+                        promise::spawn::spawn(future).detach();
+                    }
+                }
             }
             SelectTextAtMouseCursor(mode) => self.select_text_at_mouse_cursor(*mode, pane),
             ExtendSelectionToMouseCursor(mode) => {