summaryrefslogtreecommitdiffstats
path: root/osdep
diff options
context:
space:
mode:
authorRodger Combs <rodger.combs@gmail.com>2019-03-12 21:00:50 -0500
committerAkemi <der.richter@gmx.de>2019-03-13 19:44:34 +0100
commit4fd3af14cd6cd13492cf4af6cfdbd6489de58ab2 (patch)
treefab5238822e2b3cac5f363be463b41ca82223ca2 /osdep
parentec0b5e527b8aba5dbdc4592d71d780264cdb5427 (diff)
downloadmpv-4fd3af14cd6cd13492cf4af6cfdbd6489de58ab2.tar.bz2
mpv-4fd3af14cd6cd13492cf4af6cfdbd6489de58ab2.tar.xz
macosx_events: fix crash when shutting down during window animations
Diffstat (limited to 'osdep')
-rw-r--r--osdep/macosx_events.m4
1 files changed, 3 insertions, 1 deletions
diff --git a/osdep/macosx_events.m b/osdep/macosx_events.m
index a354378777..68956de43e 100644
--- a/osdep/macosx_events.m
+++ b/osdep/macosx_events.m
@@ -340,8 +340,10 @@ void cocoa_set_mpv_handle(struct mpv_handle *ctx)
switch (event->event_id) {
case MPV_EVENT_SHUTDOWN: {
#if HAVE_MACOS_COCOA_CB
- if ([(Application *)NSApp cocoaCB].isShuttingDown)
+ if ([(Application *)NSApp cocoaCB].isShuttingDown) {
+ _ctx = nil;
return;
+ }
#endif
mpv_destroy(_ctx);
_ctx = nil;