Ensure that the main display is picked up first

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%404246

src/video/cocoa/SDL_cocoamodes.m

@@ -139,7 +139,7 @@ Cocoa_InitModes(_THIS)
     CGDisplayErr result;
     CGDirectDisplayID *displays;
     CGDisplayCount numDisplays;
-    int i;
+    int pass, i;
 
     result = CGGetOnlineDisplayList(0, NULL, &numDisplays);
     if (result != kCGErrorSuccess) {
@@ -154,12 +154,24 @@ Cocoa_InitModes(_THIS)
         return;
     }
 
+    /* Pick up the primary display in the first pass, then get the rest */
+    for (pass = 0; pass < 2; ++pass) {
         for (i = 0; i < numDisplays; ++i) {
             SDL_VideoDisplay display;
             SDL_DisplayData *displaydata;
             SDL_DisplayMode mode;
             CFDictionaryRef moderef;
 
+            if (pass == 0) {
+                if (!CGDisplayIsMain(displays[i])) {
+                    continue;
+                }
+            } else {
+                if (CGDisplayIsMain(displays[i])) {
+                    continue;
+                }
+            }
+
             if (CGDisplayMirrorsDisplay(displays[i]) != kCGNullDirectDisplay) {
                 continue;
             }
@@ -184,6 +196,7 @@ Cocoa_InitModes(_THIS)
             display.driverdata = displaydata;
             SDL_AddVideoDisplay(&display);
         }
+    }
     SDL_stack_free(displays);
 }