From b5e1a797c28ea0c414a3725622dca600da888156 Mon Sep 17 00:00:00 2001
From: jp9000 <obs.jim@gmail.com>
Date: Sat, 9 Feb 2019 23:06:46 -0800
Subject: [PATCH] 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.
---
 UI/auth-mixer.cpp  | 3 +++
 UI/auth-twitch.cpp | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/UI/auth-mixer.cpp b/UI/auth-mixer.cpp
index 373cb6e30..e9fc9a94e 100644
--- a/UI/auth-mixer.cpp
+++ b/UI/auth-mixer.cpp
@@ -181,6 +181,9 @@ static inline std::string get_config_str(
 
 bool MixerAuth::LoadInternal()
 {
+	if (!cef)
+		return false;
+
 	OBSBasic *main = OBSBasic::Get();
 	name = get_config_str(main, service(), "Name");
 	id = get_config_str(main, service(), "Id");
diff --git a/UI/auth-twitch.cpp b/UI/auth-twitch.cpp
index 961e91bcf..e1d57dd5f 100644
--- a/UI/auth-twitch.cpp
+++ b/UI/auth-twitch.cpp
@@ -145,6 +145,9 @@ static inline std::string get_config_str(
 
 bool TwitchAuth::LoadInternal()
 {
+	if (!cef)
+		return false;
+
 	OBSBasic *main = OBSBasic::Get();
 	name = get_config_str(main, service(), "Name");
 	firstLoad = false;