mirror/obs-studio
0
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2024-09-19 20:32:15 +02:00
Code

mac-capture: Add handling for nil target window

Browse Source
This commit is contained in:
jcm 2023-11-04 18:29:35 -05:00 committed by Lain
parent 40562ff47e
commit a89719a2d2
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
plugins/mac-capture/mac-sck-video-capture.m
View File

@ -134,24 +134,26 @@ static bool init_screen_stream(struct screen_capture *sc)
} break;
case ScreenCaptureWindowStream: {
SCWindow *target_window = nil;
if (sc->window != 0) {
if (sc->window != kCGNullWindowID) {
for (SCWindow *window in sc->shareable_content.windows) {
if (window.windowID == sc->window) {
target_window = window;
break;
}
}
} else {
target_window = [sc->shareable_content.windows objectAtIndex:0];
sc->window = target_window.windowID;
}
content_filter = [[SCContentFilter alloc] initWithDesktopIndependentWindow:target_window];
if (target_window == nil) {
os_sem_post(sc->shareable_content_available);
sc->disp = NULL;
os_event_init(&sc->disp_finished, OS_EVENT_TYPE_MANUAL);
os_event_init(&sc->stream_start_completed, OS_EVENT_TYPE_MANUAL);
return true;
} else {
content_filter = [[SCContentFilter alloc] initWithDesktopIndependentWindow:target_window];
if (target_window) {
[sc->stream_properties setWidth:(size_t) target_window.frame.size.width];
[sc->stream_properties setHeight:(size_t) target_window.frame.size.height];
}
} break;
case ScreenCaptureApplicationStream: {
SCDisplay *target_display = get_target_display();