1 files changed, 5 insertions, 4 deletions
diff --git a/dep/CascLib/src/CascOpenStorage.cpp b/dep/CascLib/src/CascOpenStorage.cpp
index 490d889742f..6a8d83ee903 100644
--- a/dep/CascLib/src/CascOpenStorage.cpp
+++ b/dep/CascLib/src/CascOpenStorage.cpp
@@ -677,7 +677,7 @@ static LPBYTE LoadEncodingFileToMemory(HANDLE hFile, DWORD * pcbEncodingFile)
     DWORD cbEncodingFile = 0;
     DWORD dwSegmentPos = 0;
     DWORD dwNumSegments = 0;
-    DWORD dwBytesRead;
+    DWORD dwBytesRead = 0;
     int nError = ERROR_BAD_FORMAT;
 
     // Read the encoding header
@@ -724,7 +724,7 @@ static LPBYTE LoadRootFileToMemory(HANDLE hFile, DWORD * pcbRootFile)
     TCascFile * hf;
     LPBYTE pbRootFile = NULL;
     DWORD cbRootFile = 0;
-    DWORD dwBytesRead;
+    DWORD dwBytesRead = 0;
     BYTE StartOfFile[0x10];
     int nError = ERROR_SUCCESS;
 
@@ -1105,9 +1105,9 @@ static int LoadRootFile(TCascStorage * hs, DWORD dwLocaleMask)
     assert(hs->ppEncodingEntries != NULL);
 
     // Locale: The default parameter is 0 - in that case,
-    // we load enUS+enGB
+    // we assign the default locale, loaded from the .build.info file
     if(dwLocaleMask == 0)
-        dwLocaleMask = CASC_LOCALE_ENUS | CASC_LOCALE_ENGB;
+        dwLocaleMask = hs->dwDefaultLocale;
 
     // The root file is either MNDX file (Heroes of the Storm)
     // or a file containing an array of root entries (World of Warcraft 6.0+)
@@ -1243,6 +1243,7 @@ bool WINAPI CascOpenStorage(const TCHAR * szDataPath, DWORD dwLocaleMask, HANDLE
         memset(hs, 0, sizeof(TCascStorage));
         hs->szClassName = "TCascStorage";
         hs->dwFileBeginDelta = 0xFFFFFFFF;
+        hs->dwDefaultLocale = CASC_LOCALE_ENUS | CASC_LOCALE_ENGB;
         hs->dwRefCount = 1;
         nError = InitializeCascDirectories(hs, szDataPath);
     }