winemac: Check the display link running state as well as the window count to…

winemac: Check the display link running state as well as the window count to decide whether to start/stop it. The display link may be stopped even if there are associated windows, due to idleness. So, it may need to be started when a window is added even if it's not the first window. Signed-off-by: Ken Thomases <ken@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

winemac: Check the display link running state as well as the window count to…
fd6f2a17 · Ken Thomases · Alexandre Julliard · 20aaf167 · fd6f2a17
Commit fd6f2a17 authored Dec 08, 2017 by Ken Thomases Committed by Alexandre Julliard Dec 08, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 8 deletions

cocoa_window.m dlls/winemac.drv/cocoa_window.m +8 -8

No files found.
--- a/dlls/winemac.drv/cocoa_window.m
+++ b/dlls/winemac.drv/cocoa_window.m
@@ -218,25 +218,25 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi

    - (void) addWindow:(WineWindow*)window
    {
-        BOOL needsStart;
+        BOOL firstWindow;
        @synchronized(self) {
-            needsStart = !_windows.count;
+            firstWindow = !_windows.count;
            [_windows addObject:window];
        }
-        if (needsStart)
+        if (firstWindow || !CVDisplayLinkIsRunning(_link))
            CVDisplayLinkStart(_link);
    }

    - (void) removeWindow:(WineWindow*)window
    {
-        BOOL shouldStop = FALSE;
+        BOOL lastWindow = FALSE;
        @synchronized(self) {
-            BOOL wasRunning = _windows.count > 0;
+            BOOL hadWindows = _windows.count > 0;
            [_windows removeObject:window];
-            if (wasRunning && !_windows.count)
-                shouldStop = TRUE;
+            if (hadWindows && !_windows.count)
+                lastWindow = TRUE;
        }
-        if (shouldStop)
+        if (lastWindow && CVDisplayLinkIsRunning(_link))
            CVDisplayLinkStop(_link);
    }