From 28609cc4980d7a3949d2cf964048cb20f3ab8d85 Mon Sep 17 00:00:00 2001
From: der richter <der.richter@gmx.de>
Date: Sun, 15 Dec 2019 20:13:28 +0100
Subject: cocoa-cb: don't active window when minimized or hidden on file change

Fixes #7195
---
 video/out/cocoa_cb_common.swift | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/video/out/cocoa_cb_common.swift b/video/out/cocoa_cb_common.swift
index 9ba4ffd920..4be17c061c 100644
--- a/video/out/cocoa_cb_common.swift
+++ b/video/out/cocoa_cb_common.swift
@@ -81,6 +81,7 @@ class CocoaCB: NSObject {
 
     func uninit() {
         window?.orderOut(nil)
+        window?.close()
         mpv = nil
     }
 
@@ -129,6 +130,7 @@ class CocoaCB: NSObject {
         titleBar = TitleBar(frame: wr, window: window, cocoaCB: self)
 
         window.isRestorable = false
+        window.isReleasedWhenClosed = false
         window.makeMain()
         window.makeKeyAndOrderFront(nil)
         NSApp.activate(ignoringOtherApps: true)
@@ -153,7 +155,10 @@ class CocoaCB: NSObject {
         }
 
         let wr = getWindowGeometry(forScreen: targetScreen, videoOut: vo)
-        if !(window?.isVisible ?? false) {
+        if !(window?.isVisible ?? false) &&
+           !(window?.isMiniaturized ?? false) &&
+           !NSApp.isHidden
+        {
             window?.makeKeyAndOrderFront(nil)
         }
         layer?.atomicDrawingStart()
-- 
cgit v1.2.3