From fcf6b24e44db293129dca6863b399236648ef062 Mon Sep 17 00:00:00 2001 From: Norihiro Kamae Date: Mon, 20 Jun 2022 20:56:53 +0900 Subject: [PATCH] UI: Fix crash if missing module in context bar If a module is not found in context bar, it crashed when resolving source type name. This is same change as 41367bb2b but fixes window-capture and display-capture. Also removes an unnecessary pair of braces. --- UI/context-bar-controls.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/UI/context-bar-controls.cpp b/UI/context-bar-controls.cpp index f7a054a56..9299970a9 100644 --- a/UI/context-bar-controls.cpp +++ b/UI/context-bar-controls.cpp @@ -229,9 +229,8 @@ void AudioCaptureToolbar::Init() obs_module_t *mod = get_os_module("win-wasapi", "mac-capture", "linux-pulseaudio"); - if (!mod) { + if (!mod) return; - } const char *device_str = get_os_text(mod, "Device", "CoreAudio.Device", "Device"); @@ -254,6 +253,9 @@ void WindowCaptureToolbar::Init() obs_module_t *mod = get_os_module("win-capture", "mac-capture", "linux-capture"); + if (!mod) + return; + const char *device_str = get_os_text(mod, "WindowCapture.Window", "WindowUtils.Window", "Window"); ui->deviceLabel->setText(device_str); @@ -283,6 +285,9 @@ void DisplayCaptureToolbar::Init() obs_module_t *mod = get_os_module("win-capture", "mac-capture", "linux-capture"); + if (!mod) + return; + const char *device_str = get_os_text(mod, "Monitor", "DisplayCapture.Display", "Screen"); ui->deviceLabel->setText(device_str);