Skip to content

Commit 2a82009

Browse files
committed
WM (macOS): checks the version of WindowServer instead of WindowManager
1 parent e851f3a commit 2a82009

1 file changed

Lines changed: 9 additions & 2 deletions

File tree

src/detection/wm/wm_apple.m

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,16 @@
5050
if (ffStrbufEqualS(wmName, "WindowServer"))
5151
{
5252
NSError* error;
53-
NSDictionary* dict = [NSDictionary dictionaryWithContentsOfURL:[NSURL URLWithString:@"file:///System/Library/CoreServices/WindowManager.app/Contents/version.plist"]
53+
NSDictionary* dict = [NSDictionary dictionaryWithContentsOfURL:[NSURL URLWithString:@"file:///System/Library/PrivateFrameworks/SkyLight.framework/Resources/version.plist"]
5454
error:&error];
55-
ffStrbufInitS(result, ((NSString*) dict[@"CFBundleVersion"]).UTF8String);
55+
if (!dict)
56+
{
57+
dict = [NSDictionary dictionaryWithContentsOfURL:[NSURL URLWithString:@"file:///System/Library/Frameworks/ApplicationServices.framework/Frameworks/CoreGraphics.framework/Resources/version.plist"]
58+
error:&error];
59+
}
60+
61+
if (dict)
62+
ffStrbufInitS(result, ((NSString*) dict[@"CFBundleShortVersionString"]).UTF8String);
5663
}
5764

5865
return NULL;

0 commit comments

Comments
 (0)