Revert "Disable pack file loading if debugging is not set."

This reverts commit 8fd3194876.

Conflicts:
	src/gui/main_win.cpp
This commit is contained in:
Oliver Hamlet
2015-02-08 20:58:35 +00:00
parent b866d1fc40
commit d95652f8f4
2 changed files with 4 additions and 11 deletions
+1 -1
View File
@@ -274,7 +274,7 @@ FOREACH(cef_dll d3dcompiler_47.dll libEGL.dll libGLESv2.dll libcef.dll wow_helpe
$<TARGET_FILE_DIR:LOOT>)
ENDFOREACH()
# Copy CEF resources. The .pak files are for debugging only.
# Copy CEF resources.
FOREACH(cef_resource cef.pak cef_100_percent.pak cef_200_percent.pak devtools_resources.pak icudtl.dat)
add_custom_command(TARGET LOOT POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different
+3 -10
View File
@@ -43,7 +43,7 @@ using namespace loot;
using boost::locale::translate;
using boost::format;
CefSettings GetCefSettings(bool debuggingEnabled) {
CefSettings GetCefSettings() {
CefSettings cef_settings;
//Enable CEF command line args.
@@ -52,11 +52,7 @@ CefSettings GetCefSettings(bool debuggingEnabled) {
// Set CEF logging.
CefString(&cef_settings.log_file).FromString((g_path_local / "CEFDebugLog.txt").string());
// Disable pack file loading if debugging is not enabled.
cef_settings.pack_loading_disabled = !debuggingEnabled;
// If pack file loading is not disabled, load locale pack files from LOOT's
// l10n path.
// Load locale pack files from LOOT's l10n path.
CefString(&cef_settings.locales_dir_path).FromString(g_path_l10n.string());
return cef_settings;
@@ -116,9 +112,6 @@ int APIENTRY wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmd
if (command_line->HasSwitch("game")) { // Format is: --game=<game>
gameStr = command_line->GetSwitchValue("game");
}
// The CEF pack files are only used for debugging using the dev tools.
// Disable them unless a remote debugging port is set.
bool debuggingEnabled = command_line->HasSwitch("remote-debugging-port");
loot::g_app_state.Init(gameStr);
@@ -126,7 +119,7 @@ int APIENTRY wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmd
//------------
// Initialise CEF settings.
CefSettings cef_settings = GetCefSettings(debuggingEnabled);
CefSettings cef_settings = GetCefSettings();
// Initialize CEF.
CefInitialize(main_args, cef_settings, app.get(), sandbox_info);