github
/
mpv
mirror of https://github.com/mpv-player/mpv
1
Fork 0
Code Releases Activity

mac, cocoa: fix UI updates on none main queue threads 

injecting the Apple Main Thread Checker via
DYLD_INSERT_LIBRARIES=libMainThreadChecker.dylib identified several
problems that needed fixing.
This commit is contained in:
der richter 2020-02-22 12:22:16 +01:00
parent 8e1ceaba34
commit 327b092bfc
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
osdep/macosx_application.m
View File

@ -99,8 +99,10 @@ static Application *mpv_shared_app(void)
static void terminate_cocoa_application(void)
{
[NSApp hide:NSApp];
[NSApp terminate:NSApp];
dispatch_async(dispatch_get_main_queue(), ^{
[NSApp hide:NSApp];
[NSApp terminate:NSApp];
});
}
@implementation Application
@ -300,7 +302,9 @@ static void init_cocoa_application(bool regular)
// Because activation policy has just been set to behave like a real
// application, that policy must be reset on exit to prevent, among
// other things, the menubar created here from remaining on screen.
[NSApp setActivationPolicy:NSApplicationActivationPolicyProhibited];
dispatch_async(dispatch_get_main_queue(), ^{
[NSApp setActivationPolicy:NSApplicationActivationPolicyProhibited];
});
});
}

6
video/out/cocoa_common.m
View File

@ -395,8 +395,10 @@ void vo_cocoa_init(struct vo *vo)
cocoa_add_event_monitor(vo);
if (!s->embedded) {
[NSApp setActivationPolicy:NSApplicationActivationPolicyRegular];
set_application_icon(NSApp);
run_on_main_thread(vo, ^{
[NSApp setActivationPolicy:NSApplicationActivationPolicyRegular];
set_application_icon(NSApp);
});
}
}