From f46f9f96e00f5a9e1dce33fd46664e7a41d2f517 Mon Sep 17 00:00:00 2001
From: Oliver Hamlet <oliver.hamlet@gmail.com>
Date: Sun, 6 Dec 2015 13:17:02 +0000
Subject: [PATCH] Remove use of CEF sandbox

The sandbox library file is distributed prebuilt using MSVC 2013, which
means it can't be linked from MSVC 2015, which is in turn needed for
libloadorder's incoming thread safety support, as MSVC 2013 doesn't
support the thread_local keyword.

Removal of the sandbox shouldn't be an issue, as no external
resources/HTTP requests/etc. are used.
---
 CMakeLists.txt   | 1 -
 src/gui/main.cpp | 6 +-----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6a8caf58..0fa4a620 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -287,7 +287,6 @@ ELSEIF (MSVC)
                     crypt32
                     Rpcrt4)
     set (LOOT_GUI_LIBS ${LOOT_LIBS}
-                       cef_sandbox
                        libcef
                        libcef_dll_wrapper
                        rpcrt4
diff --git a/src/gui/main.cpp b/src/gui/main.cpp
index ca50880b..b2665641 100644
--- a/src/gui/main.cpp
+++ b/src/gui/main.cpp
@@ -99,10 +99,6 @@ int main(int argc, char* argv[]) {
     // Enable High-DPI support on Windows 7 or newer.
     CefEnableHighDPISupport();
 
-    // Set up CEF sandbox.
-    CefScopedSandboxInfo scoped_sandbox;
-    sandbox_info = scoped_sandbox.sandbox_info();
-
     // Read command line arguments.
     CefMainArgs main_args(hInstance);
 #else
@@ -114,7 +110,7 @@ int main(int argc, char* argv[]) {
     CefRefPtr<loot::LootApp> app(new loot::LootApp);
 
     // Run the process.
-    int exit_code = CefExecuteProcess(main_args, app.get(), sandbox_info);
+    int exit_code = CefExecuteProcess(main_args, app.get(), nullptr);
     if (exit_code >= 0) {
         // The sub-process has completed so return here.
         return exit_code;