Workspace: adopt last OSEScreen changes

trunkmaster · trunkmaster · commit 049d8112954a · 2025-02-26T17:04:06.000+02:00
diff --git a/Applications/Workspace/Controller.m b/Applications/Workspace/Controller.m
@@ -1434,7 +1434,7 @@ - (void)mediaOperationDidEnd:(NSNotification *)notif
 - (void)lidDidChange:(NSNotification *)aNotif
 {
   OSEDisplay *builtinDisplay = nil;
-  OSEScreen *screen = [OSEScreen new];
+  OSEScreen *screen = [[OSEScreen sharedScreen] retain];
 
   for (OSEDisplay *d in [screen connectedDisplays]) {
     if ([d isBuiltin]) {
diff --git a/Applications/Workspace/Workspace_main.m b/Applications/Workspace/Workspace_main.m
@@ -142,9 +142,8 @@ int main(int argc, const char **argv)
   dispatch_sync(workspace_q, ^{
     @autoreleasepool {
       // Restore display layout
-      OSEScreen *screen = [OSEScreen new];
+      OSEScreen *screen = [OSEScreen sharedScreen];
       [screen applySavedDisplayLayout];
-      [screen release];
     }
   });
   {

Original file line number	Diff line number	Diff line change
`@@ -1434,7 +1434,7 @@ - (void)mediaOperationDidEnd:(NSNotification *)notif`
`1434`	`1434`	`- (void)lidDidChange:(NSNotification *)aNotif`
`1435`	`1435`	`{`
`1436`	`1436`	`OSEDisplay *builtinDisplay = nil;`
`1437`		`- OSEScreen *screen = [OSEScreen new];`
	`1437`	`+ OSEScreen *screen = [[OSEScreen sharedScreen] retain];`
`1438`	`1438`
`1439`	`1439`	`for (OSEDisplay *d in [screen connectedDisplays]) {`
`1440`	`1440`	`if ([d isBuiltin]) {`
Original file line number	Diff line number	Diff line change
`@@ -142,9 +142,8 @@ int main(int argc, const char **argv)`
`142`	`142`	`dispatch_sync(workspace_q, ^{`
`143`	`143`	`@autoreleasepool {`
`144`	`144`	`// Restore display layout`
`145`		`- OSEScreen *screen = [OSEScreen new];`
	`145`	`+ OSEScreen *screen = [OSEScreen sharedScreen];`
`146`	`146`	`[screen applySavedDisplayLayout];`
`147`		`- [screen release];`
`148`	`147`	`}`
`149`	`148`	`});`
`150`	`149`	`{`