jp9000/obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

UI: Check that CEF loaded before loading integrations

Browse Source 
Fixes a case where a certain plugin that entirely replaces OBS's own
browser plugin would cause OBS to crash with the new service
integration.  ..Yea.
This commit is contained in:
jp9000 2019-02-09 23:06:46 -08:00
parent 6d84bc4b03
commit b5e1a797c2
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
UI/auth-mixer.cpp
View File

@ -181,6 +181,9 @@ static inline std::string get_config_str(
bool MixerAuth::LoadInternal() bool MixerAuth::LoadInternal()
{ {
if (!cef)
return false;
OBSBasic *main = OBSBasic::Get(); OBSBasic *main = OBSBasic::Get();
name = get_config_str(main, service(), "Name"); name = get_config_str(main, service(), "Name");
id = get_config_str(main, service(), "Id"); id = get_config_str(main, service(), "Id");

3
UI/auth-twitch.cpp
View File

@ -145,6 +145,9 @@ static inline std::string get_config_str(
bool TwitchAuth::LoadInternal() bool TwitchAuth::LoadInternal()
{ {
if (!cef)
return false;
OBSBasic *main = OBSBasic::Get(); OBSBasic *main = OBSBasic::Get();
name = get_config_str(main, service(), "Name"); name = get_config_str(main, service(), "Name");
firstLoad = false; firstLoad = false;