From 690b5bbc2979f19606103a7cc5de51bcfc497aa3 Mon Sep 17 00:00:00 2001 From: Zakk Date: Mon, 9 Dec 2019 04:34:37 -0500 Subject: [PATCH] Change stream/record button enable logic: stream button is active if ANY output is flagged stream, not if any output is EXCLUSIVELY stream enabled --- .../CSAppleWebViewCapturePlugin/CSAppleWebViewCapture.m | 4 ++-- .../CSWindowCapturePlugin/WindowCapture.m | 1 + CocoaSplit/CaptureController.m | 4 +++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CapturePlugins/CSAppleWebViewCapturePlugin/CSAppleWebViewCapturePlugin/CSAppleWebViewCapture.m b/CapturePlugins/CSAppleWebViewCapturePlugin/CSAppleWebViewCapturePlugin/CSAppleWebViewCapture.m index ea4d2424..17985011 100644 --- a/CapturePlugins/CSAppleWebViewCapturePlugin/CSAppleWebViewCapturePlugin/CSAppleWebViewCapture.m +++ b/CapturePlugins/CSAppleWebViewCapturePlugin/CSAppleWebViewCapturePlugin/CSAppleWebViewCapture.m @@ -55,8 +55,8 @@ config.mediaTypesRequiringUserActionForPlayback = WKAudiovisualMediaTypeNone; } - - self.webView = [[WKWebView alloc] initWithFrame:CGRectMake(0, 0, self.browser_width, self.browser_height) configuration:[[WKWebViewConfiguration alloc] init]]; + config.preferences = webPrefs; + self.webView = [[WKWebView alloc] initWithFrame:CGRectMake(0, 0, self.browser_width, self.browser_height) configuration:config]; self.webView.navigationDelegate = self; self.webView.layer.backgroundColor = [NSColor clearColor].CGColor; } diff --git a/CapturePlugins/CSWindowCapturePlugin/CSWindowCapturePlugin/WindowCapture.m b/CapturePlugins/CSWindowCapturePlugin/CSWindowCapturePlugin/WindowCapture.m index e90085cf..f77ad8d9 100644 --- a/CapturePlugins/CSWindowCapturePlugin/CSWindowCapturePlugin/WindowCapture.m +++ b/CapturePlugins/CSWindowCapturePlugin/CSWindowCapturePlugin/WindowCapture.m @@ -9,6 +9,7 @@ #import "WindowCapture.h" #import "WindowCaptureViewController.h" + @implementation WindowCapture /* CGWindowListCreateImage sucks. It's really slow. This probably isn't a useful capture type, but whatever */ diff --git a/CocoaSplit/CaptureController.m b/CocoaSplit/CaptureController.m index f5111973..44fd815d 100644 --- a/CocoaSplit/CaptureController.m +++ b/CocoaSplit/CaptureController.m @@ -1251,7 +1251,9 @@ NSString *const CSAppearanceSystem = @"CSAppearanceSystem"; if (outdest.isRecorder) { record_outputs++; - } else if (outdest.isStreamer) { + } + + if (outdest.isStreamer) { stream_outputs++; }