winemac: Restore display mode to original in more cases.

We only care if we have changed the mode and we're changing it back to its original. Even if the current mode matches the target mode, we may still need to release the displays and clear the entry from originalDisplayModes.

winemac: Restore display mode to original in more cases.
42a7d720 · Ken Thomases · Alexandre Julliard · 9c65d672 · 42a7d720
Commit 42a7d720 authored Jan 10, 2014 by Ken Thomases Committed by Alexandre Julliard Jan 10, 2014
Hide whitespace changes
Inline Side-by-side

Showing with 28 additions and 22 deletions

cocoa_app.m dlls/winemac.drv/cocoa_app.m +28 -22

No files found.
--- a/dlls/winemac.drv/cocoa_app.m
+++ b/dlls/winemac.drv/cocoa_app.m
@@ -711,27 +711,7 @@ int macdrv_err_on;
        BOOL ret = FALSE;
        BOOL active = [NSApp isActive];
        NSNumber* displayIDKey = [NSNumber numberWithUnsignedInt:displayID];
-        CGDisplayModeRef currentMode = NULL, originalMode;
-
-        if (!active)
-            currentMode = CGDisplayModeRetain((CGDisplayModeRef)[latentDisplayModes objectForKey:displayIDKey]);
-        if (!currentMode)
-            currentMode = CGDisplayCopyDisplayMode(displayID);
-        if (!currentMode) // Invalid display ID
-            return FALSE;
-
-        if ([self mode:mode matchesMode:currentMode]) // Already there!
-        {
-            CGDisplayModeRelease(currentMode);
-            return TRUE;
-        }
-
-        CGDisplayModeRelease(currentMode);
-        currentMode = NULL;
-
-        mode = [self modeMatchingMode:mode forDisplay:displayID];
-        if (!mode)
-            return FALSE;
+        CGDisplayModeRef originalMode;

        originalMode = (CGDisplayModeRef)[originalDisplayModes objectForKey:displayIDKey];

@@ -752,7 +732,11 @@ int macdrv_err_on;
            else // ... otherwise, try to restore just the one display
            {
                if (active)
-                    ret = (CGDisplaySetDisplayMode(displayID, mode, NULL) == CGDisplayNoErr);
+                {
+                    mode = [self modeMatchingMode:mode forDisplay:displayID];
+                    if (mode)
+                        ret = (CGDisplaySetDisplayMode(displayID, mode, NULL) == CGDisplayNoErr);
+                }
                else
                {
                    [latentDisplayModes removeObjectForKey:displayIDKey];
@@ -764,6 +748,28 @@ int macdrv_err_on;
        }
        else
        {
+            CGDisplayModeRef currentMode = NULL;
+
+            if (!active)
+                currentMode = CGDisplayModeRetain((CGDisplayModeRef)[latentDisplayModes objectForKey:displayIDKey]);
+            if (!currentMode)
+                currentMode = CGDisplayCopyDisplayMode(displayID);
+            if (!currentMode) // Invalid display ID
+                return FALSE;
+
+            if ([self mode:mode matchesMode:currentMode]) // Already there!
+            {
+                CGDisplayModeRelease(currentMode);
+                return TRUE;
+            }
+
+            CGDisplayModeRelease(currentMode);
+            currentMode = NULL;
+
+            mode = [self modeMatchingMode:mode forDisplay:displayID];
+            if (!mode)
+                return FALSE;
+
            if ([originalDisplayModes count] || displaysCapturedForFullscreen ||
                !active || CGCaptureAllDisplays() == CGDisplayNoErr)
            {