github/mpv
1
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-11-03 03:19:24 +01:00
Code Releases Activity

cocoa-cb: fix crash on startup with not initialised title bar

Browse Source 
the first mouse events, that try to hide the title bar, could happen
before the title bar was actually initialised. that caused our hiding
code to access a nil value. check for an available title bar before
trying to hide it.
This commit is contained in:
Akemi 2018-03-13 21:14:27 +01:00 committed by Kevin Mitchell
parent 749f5c8d65
commit 0c2f11cee6
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
video/out/cocoa-cb/window.swift
View File

@ -158,7 +158,7 @@ class Window: NSWindow, NSWindowDelegate {
}
func showTitleBar() {
if !border && !isInFullscreen { return }
if titleBarEffect == nil || (!border && !isInFullscreen) { return }
let loc = cocoaCB.view.convert(mouseLocationOutsideOfEventStream, from: nil)
titleButtons.forEach { $0.isHidden = false }
@ -178,6 +178,7 @@ class Window: NSWindow, NSWindowDelegate {
}
func hideTitleBar() {
if titleBarEffect == nil { return }
if isInFullscreen && !isAnimating {
titleBarEffect!.alphaValue = 0
return