KofTwentyTwo/CommandTabFree
2
0 Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases 4 Wiki Activity

fix: crash when windows changed between the CG and the AX calls

Browse Source
This commit is contained in:
Louis Pontoise committed 2019-09-16 19:55:27 +09:00
1 parent 6f613547c4
commit 2fa140f027
1 file changed
+6 -3
Download Patch File Download Diff File Expand all files Collapse all files
alt-tab-macos/ui/Application.swift
+6 -3
View File
@@ -131,9 +131,12 @@ class Application: NSApplication, NSApplicationDelegate, NSWindowDelegate, NSCol
let cgTitle = String(cgWindow[kCGWindowName] as! NSString) let cgTitle = String(cgWindow[kCGWindowName] as! NSString)
let cgOwnerPid = cgWindow[kCGWindowOwnerPID] as! pid_t let cgOwnerPid = cgWindow[kCGWindowOwnerPID] as! pid_t
let i = pidAndCurrentIndex.index(forKey: cgOwnerPid) let i = pidAndCurrentIndex.index(forKey: cgOwnerPid)
pidAndCurrentIndex[cgOwnerPid] = i == nil ? 0 : pidAndCurrentIndex[i!].value + 1 pidAndCurrentIndex[cgOwnerPid] = (i == nil ? 0 : pidAndCurrentIndex[i!].value + 1)
let axWindow = axWindows(cgOwnerPid)[pidAndCurrentIndex[cgOwnerPid]!] let axWindow = axWindows(cgOwnerPid)
openWindows.append(OpenWindow(target: axWindow, ownerPid: cgOwnerPid, cgId: cgId, cgTitle: cgTitle)) // windows may have changed between the CG and the AX calls
if axWindow.count > pidAndCurrentIndex[cgOwnerPid]! {
openWindows.append(OpenWindow(target: axWindow[pidAndCurrentIndex[cgOwnerPid]!], ownerPid: cgOwnerPid, cgId: cgId, cgTitle: cgTitle))
}
} }
} }