Browse Source

UI: Check that CEF loaded before loading integrations

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.
jp9000 6 years ago
parent
commit
b5e1a797c2
2 changed files with 6 additions and 0 deletions
  1. 3 0
      UI/auth-mixer.cpp
  2. 3 0
      UI/auth-twitch.cpp

+ 3 - 0
UI/auth-mixer.cpp

@@ -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 - 0
UI/auth-twitch.cpp

@@ -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;