SkyHook
/
SkyHook
Archived
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: application blocks on start

v1
paring 2023-05-28 17:25:15 +09:00
parent de06cc1a32
commit 0f3a057fd4
Signed by: pikokr
GPG Key ID: 8C7ABCEF704FD728
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
skyhook/src/platforms/macos/native/src/MacOSHook.swift
View File

@ -4,7 +4,6 @@ import Cocoa
class MacOSHook { class MacOSHook {
var callback: EventCallback var callback: EventCallback
let thread: MacOSHookThread let thread: MacOSHookThread
private var dummyCounter = 0
init(callback: EventCallback) { init(callback: EventCallback) {
self.callback = callback self.callback = callback
@ -17,8 +16,10 @@ class MacOSHook {
func start() throws { func start() throws {
thread.start() thread.start()
while (!thread.started && thread.error == nil) { while (true) {
dummyCounter += 1 if (thread.started || thread.error != nil) {
break
}
} }
if (thread.error != nil) { if (thread.error != nil) {
@ -31,8 +32,10 @@ class MacOSHook {
CFRunLoopStop(self.thread.runLoop) CFRunLoopStop(self.thread.runLoop)
} }
while (self.thread.started) { while (true) {
dummyCounter += 1 if (!self.thread.started) {
break
}
} }
} }
} }

2
skyhook/src/platforms/macos/native/src/MacOSHookThread.swift
View File

@ -83,7 +83,7 @@ class MacOSHookThread : Thread {
eventTap = nil eventTap = nil
started = false self.started = false
} }
func eventCallback(proxy: OpaquePointer, type: CGEventType, event: CGEvent, refcon: UnsafeMutableRawPointer?) -> Unmanaged<CGEvent>? { func eventCallback(proxy: OpaquePointer, type: CGEventType, event: CGEvent, refcon: UnsafeMutableRawPointer?) -> Unmanaged<CGEvent>? {

1
skyhook/src/platforms/macos/native/src/lib.swift
View File

@ -40,4 +40,3 @@ public func stopMacOSHook(callback: EventCallback) -> UnsafePointer<CChar>? {
public func macosHookRunning() -> Bool { public func macosHookRunning() -> Bool {
return hook != nil; return hook != nil;
} }