winemac: Don't record original display modes when not the active app.

originalDisplayModes should be used when active, empty when inactive. latentDisplayModes is used when inactive, empty when active. The count of entries in originalDisplayModes is used to test whether the process has the displays captured so adding entries when inactive would give incorrect results. This could have led us to mistakenly change the display mode when we don't have the displays captured.

winemac: Don't record original display modes when not the active app.
fe1c0ab9 · Ken Thomases · Alexandre Julliard · a1d8886f · fe1c0ab9
Commit fe1c0ab9 authored Jan 10, 2014 by Ken Thomases Committed by Alexandre Julliard Jan 10, 2014
Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 9 deletions

cocoa_app.m dlls/winemac.drv/cocoa_app.m +11 -9

No files found.
--- a/dlls/winemac.drv/cocoa_app.m
+++ b/dlls/winemac.drv/cocoa_app.m
@@ -770,21 +770,23 @@ int macdrv_err_on;
                !active || CGCaptureAllDisplays() == CGDisplayNoErr)
            {
                if (active)
+                {
                    ret = (CGDisplaySetDisplayMode(displayID, mode, NULL) == CGDisplayNoErr);
+                    if (ret)
+                        [originalDisplayModes setObject:(id)originalMode forKey:displayIDKey];
+                    else if (![originalDisplayModes count])
+                    {
+                        CGRestorePermanentDisplayConfiguration();
+                        [latentDisplayModes removeAllObjects];
+                        if (!displaysCapturedForFullscreen)
+                            CGReleaseAllDisplays();
+                    }
+                }
                else
                {
                    [latentDisplayModes setObject:(id)mode forKey:displayIDKey];
                    ret = TRUE;
                }
-                if (ret)
-                    [originalDisplayModes setObject:(id)originalMode forKey:displayIDKey];
-                else if (![originalDisplayModes count])
-                {
-                    CGRestorePermanentDisplayConfiguration();
-                    [latentDisplayModes removeAllObjects];
-                    if (!displaysCapturedForFullscreen)
-                        CGReleaseAllDisplays();
-                }
            }
        }