Skip to content

Commit 1330f24

Browse files
committed
Revert last (not a fix)
1 parent 04da48c commit 1330f24

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

Client/cefweb/CWebCore.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ bool CWebCore::Initialise()
7272
CefString(&settings.browser_subprocess_path).FromWString(FromUTF8(CalcMTASAPath("MTA\\CEF\\CEFLauncher_d.exe")));
7373
#endif
7474
CefString(&settings.cache_path).FromWString(FromUTF8(CalcMTASAPath("MTA\\CEF\\cache")));
75+
CefString(&settings.locales_dir_path).FromWString(FromUTF8(CalcMTASAPath("MTA\\CEF\\locales")));
7576
CefString(&settings.log_file).FromWString(FromUTF8(CalcMTASAPath("MTA\\CEF\\cefdebug.txt")));
7677
#ifdef MTA_DEBUG
7778
settings.log_severity = cef_log_severity_t::LOGSEVERITY_INFO;

Shared/installer/nightly.nsi

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -702,9 +702,8 @@ SectionGroup /e "$(INST_SEC_CLIENT)" SECGCLIENT
702702
# Below file was included in the deprecation referenced above, but already disabled in MTA beforehand
703703
#File "${FILES_ROOT}\mta\CEF\cef_extensions.pak"
704704

705-
# CEF locales
706-
SetOutPath "$INSTDIR\MTA\"
707-
File "${FILES_ROOT}\mta\en-US.pak"
705+
SetOutPath "$INSTDIR\MTA\CEF\locales"
706+
File "${FILES_ROOT}\mta\CEF\locales\en-US.pak"
708707

709708

710709
${If} "$(LANGUAGE_CODE)" != ""

vendor/cef3/premake5.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ project "CEF"
2121
"{COPY} \""..cef_path.."Release/*\" \""..path.."mta\"",
2222
"{COPY} \""..cef_path.."Resources/icudtl.dat\" \""..path.."mta\"",
2323
"{COPY} \""..cef_path.."Resources/*.pak\" \""..path.."mta\"",
24-
"{COPY} \""..cef_path.."Resources/locales/*\" \""..path.."mta\""
24+
"{COPY} \""..cef_path.."Resources/locales/*\" \""..path.."mta/cef/locales\""
2525
}
2626

2727
filter "architecture:not x86"

0 commit comments

Comments
 (0)