From 21aeafd8dd5fd544d58e3f00b17fefe50a95f552 Mon Sep 17 00:00:00 2001 From: lwouis Date: Tue, 27 Jan 2026 18:37:37 +0100 Subject: [PATCH] fix: quitting apps by pressing q multiple times (closes #5247) --- src/logic/Windows.swift | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/logic/Windows.swift b/src/logic/Windows.swift index b9c70548..ecb5c0d1 100644 --- a/src/logic/Windows.swift +++ b/src/logic/Windows.swift @@ -205,11 +205,17 @@ class Windows { } static func updateSelectedWindow() { - guard let index = (list.firstIndex { $0.id == selectedWindowTarget }) else { - setInitialSelectedAndHoveredWindowIndex() + // selectedWindowTarget still exists: we select its new index + if let index = (list.firstIndex { $0.id == selectedWindowTarget }) { + updateSelectedAndHoveredWindowIndex(index) return } - updateSelectedAndHoveredWindowIndex(index) + // list has reduced (e.g. app was quit). Selection should be at the end, so users can for example quit many apps in a sequence + let lastIndex = list.filter { $0.shouldShowTheUser }.count - 1 + if selectedWindowIndex > lastIndex { + updateSelectedAndHoveredWindowIndex(lastIndex) + } + // selectedWindowIndex is undisturbed: do nothing } static func updateSelectedAndHoveredWindowIndex(_ newIndex: Int, _ fromMouse: Bool = false) {