Merge branch 'master' into bugfix/wheels_visibility

FileEX · Jan 7, 2024 · 13f739e · 13f739e
2 parents eab4152 + e242f22
commit 13f739e
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 25 deletions.
diff --git a/Client/game_sa/CStreamingSA.cpp b/Client/game_sa/CStreamingSA.cpp
@@ -431,6 +431,8 @@ void CStreamingSA::RemoveArchive(unsigned char ucArchiveID)
 
 bool CStreamingSA::SetStreamingBufferSize(uint32 numBlocks)
 {
+    numBlocks += numBlocks % 2; // Make sure number is even by "rounding" it upwards. [Otherwise it can't be split in half properly]
+
     // Check if the size is the same already
     if (numBlocks == ms_streamingHalfOfBufferSizeBlocks * 2)
         return true;
@@ -453,10 +455,6 @@ bool CStreamingSA::SetStreamingBufferSize(uint32 numBlocks)
 
     // Suspend streaming thread [otherwise data might become corrupted]
     SuspendThread(*phStreamingThread);
-
-    // Create new buffer
-    if (numBlocks & 1) // Make it be even [Otherwise it can't be split in half properly]
-        numBlocks++;
 
     // Calculate new buffer pointers
     void* const pNewBuff0 = pNewBuffer;

diff --git a/utils/buildactions/install_cef.lua b/utils/buildactions/install_cef.lua
@@ -9,8 +9,8 @@ local CEF_URL_PREFIX = "https://cef-builds.spotifycdn.com/cef_binary_"
 local CEF_URL_SUFFIX = "_windows32_minimal.tar.bz2"
 
 -- Change here to update CEF version
-local CEF_VERSION = "120.1.10+g3ce3184+chromium-120.0.6099.129"
-local CEF_HASH = "95d549faf674983b189293212b09bb6137735483d17abcf9da0d1132864fa3be"
+local CEF_VERSION = "120.2.3+g7d89c0c+chromium-120.0.6099.199"
+local CEF_HASH = "1a64881991a04f5720067f9fff6f47970f960868acd64c9fc41152a641fd9b6f"
 
 function make_cef_download_url()
 	return CEF_URL_PREFIX..http.escapeUrlParam(CEF_VERSION)..CEF_URL_SUFFIX

diff --git a/utils/localization/generate-images/package-lock.json b/utils/localization/generate-images/package-lock.json
diff --git a/utils/localization/generate-images/package.json b/utils/localization/generate-images/package.json
@@ -11,7 +11,7 @@
   },
   "dependencies": {
     "@squoosh/lib": "~0.4.0",
-    "chromedriver": "^114.0.2",
+    "chromedriver": "^119.0.1",
     "fs-extra": "^11.1.1",
     "http-server": "^14.1.1",
     "selenium-webdriver": "^4.10.0"