Forgot to treat confirm_os_window_close as a count

This commit is contained in:
Kovid Goyal 2020-05-19 08:19:17 +05:30
parent 6768bc1705
commit 7bf83603c8
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C

View File

@ -731,10 +731,10 @@ class Boss:
self.confirm_os_window_close(tm.os_window_id) self.confirm_os_window_close(tm.os_window_id)
def confirm_os_window_close(self, os_window_id: int) -> None: def confirm_os_window_close(self, os_window_id: int) -> None:
if not self.opts.confirm_os_window_close: tm = self.os_window_map.get(os_window_id)
if tm is None or self.opts.confirm_os_window_close <= tm.number_of_windows:
mark_os_window_for_close(os_window_id) mark_os_window_for_close(os_window_id)
return return
tm = self.os_window_map.get(os_window_id)
if tm is not None: if tm is not None:
w = tm.active_window w = tm.active_window
self._run_kitten('ask', ['--type=yesno', '--message', _( self._run_kitten('ask', ['--type=yesno', '--message', _(
@ -765,14 +765,14 @@ class Boss:
def quit(self, *args: Any) -> None: def quit(self, *args: Any) -> None:
tm = self.active_tab tm = self.active_tab
if not self.opts.confirm_os_window_close or tm is None: num = 0
for q in self.os_window_map.values():
num += q.number_of_windows
if self.opts.confirm_os_window_close <= num or tm is None:
set_application_quit_request(IMPERATIVE_CLOSE_REQUESTED) set_application_quit_request(IMPERATIVE_CLOSE_REQUESTED)
return return
if current_application_quit_request() == CLOSE_BEING_CONFIRMED: if current_application_quit_request() == CLOSE_BEING_CONFIRMED:
return return
num = 0
for q in self.os_window_map.values():
num += q.number_of_windows
self._run_kitten('ask', ['--type=yesno', '--message', _( self._run_kitten('ask', ['--type=yesno', '--message', _(
'Are you sure you want to quit kitty, it has {} windows running?').format(num)], 'Are you sure you want to quit kitty, it has {} windows running?').format(num)],
window=tm.active_window, window=tm.active_window,