commit 68fd4e8bb35eed4ef23f1ac334c10bbdf8ac831b
author Doug Binks <doug@enkisoftware.com> Sat Sep 08 18:49:19 2018 +0200
committer Camilla Löwy <elmindreda@elmindreda.org> Tue Mar 05 16:58:45 2019 +0100
tree d90d659ecb1cfd97fddf542016242f47a007269d
parent ba4e78e57ffbd9ebf6e7fe6863936319f4a50357

Cocoa: Fix work area retrieval on missing screen

Closes #1322.

src/cocoa_monitor.m

diff --git a/src/cocoa_monitor.m b/src/cocoa_monitor.m
index e4eb12d..9e74e15 100644
--- a/src/cocoa_monitor.m
+++ b/src/cocoa_monitor.m
@@ -413,21 +413,18 @@
     NSScreen *resultScreen;
     for (NSScreen *screen in [NSScreen screens]) {
         if ([[[screen deviceDescription] valueForKey:@"NSScreenNumber"] intValue] == monitor->ns.displayID) {
-            resultScreen = screen;
+            NSRect frameRect = [screen visibleFrame];
+            if (xpos)
+                *xpos = NSMinX(frameRect);
+            if (ypos)
+                *ypos = NSMinY(frameRect);
+            if (width)
+                *width = NSWidth(frameRect);
+            if (height)
+                *height = NSHeight(frameRect);
             break;
         }
     }
-
-    NSRect frameRect = [[NSScreen resultScreen] visibleFrame];
-
-    if (xpos)
-        *xpos = NSMinX(frameRect);
-    if (ypos)
-        *ypos = NSMinY(frameRect);
-    if (width)
-        *width = NSWidth(frameRect);
-    if (height)
-        *height = NSHeight(frameRect);
 }
 
 GLFWvidmode* _glfwPlatformGetVideoModes(_GLFWmonitor* monitor, int* count)