mirror/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-07-27 07:36:15 -04:00
Code Issues Packages Projects Releases Wiki Activity

UI: Fix case where cef func may not be present

Browse Source 
Due to a particular... plugin we all know and love, the new
QCefWidget::executeJavascript() function may not actually be present as
it should be. So, we have to verify that it's available, and only use it
in that case.
This commit is contained in:
Lain
2023-08-05 04:30:09 -07:00
parent c946090203
commit 78cb2aa361
6 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
UI/window-basic-main.cpp
View File

@@ -116,6 +116,7 @@ struct QCefCookieManager;
QCef *cef = nullptr;
QCefCookieManager *panel_cookies = nullptr;
bool cef_js_avail = false;
void DestroyPanelCookieManager();
@@ -2022,6 +2023,7 @@ void OBSBasic::OBSInit()
#ifdef BROWSER_AVAILABLE
cef = obs_browser_init_panel();
cef_js_avail = cef && obs_browser_qcef_version() >= 3;
#endif
OBSDataAutoRelease obsData = obs_get_private_data();
@@ -8493,7 +8495,7 @@ YouTubeAppDock *OBSBasic::GetYouTubeAppDock()
void OBSBasic::NewYouTubeAppDock()
{
if (!cef)
if (!cef_js_avail)
return;
if (youtubeAppDock)
@@ -8504,7 +8506,7 @@ void OBSBasic::NewYouTubeAppDock()
void OBSBasic::DeleteYouTubeAppDock()
{
if (!cef)
if (!cef_js_avail)
return;
if (youtubeAppDock)