diff options
| author | der richter <der.richter@gmx.de> | 2019-05-11 12:54:44 +0200 |
|---|---|---|
| committer | der richter <der.richter@gmx.de> | 2019-05-11 12:54:44 +0200 |
| commit | 64cdc3694e19fb3a51565c311ac82e92f90a62a9 (patch) | |
| tree | 9779ef861acc867915ef91c95eec1e79d9c7c1bd /video | |
| parent | 86bdd220601b3556a026943f8524f51d307b3868 (diff) | |
| download | mpv-64cdc3694e19fb3a51565c311ac82e92f90a62a9.tar.bz2 mpv-64cdc3694e19fb3a51565c311ac82e92f90a62a9.tar.xz | |
cocoa-cb: fix quit in fs with none native fs
since the none native fs is a special legacy case it needs a special
quit routine. it indefinitely waited for an exit fs screen event to
shutdown properly, though that event only fires for the native fs.
now we check if we really are using a native fullscreen and if not
shutdown immediately.
Fixes #6704
Diffstat (limited to 'video')
| -rw-r--r-- | video/out/cocoa_cb_common.swift | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/video/out/cocoa_cb_common.swift b/video/out/cocoa_cb_common.swift index 14c752a8f1..21f6d3f95d 100644 --- a/video/out/cocoa_cb_common.swift +++ b/video/out/cocoa_cb_common.swift @@ -524,7 +524,8 @@ class CocoaCB: NSObject { } func shutdown(_ destroy: Bool = false) { - isShuttingDown = window?.isAnimating ?? false || window?.isInFullscreen ?? false + isShuttingDown = window?.isAnimating ?? false || + window?.isInFullscreen ?? false && mpv.getBoolProperty("native-fs") if window?.isInFullscreen ?? false && !(window?.isAnimating ?? false) { window?.close() } |