diff --git a/scripts/release-win64.sh b/scripts/release-win64.sh
index 25986dbee..fbc79bbad 100755
--- a/scripts/release-win64.sh
+++ b/scripts/release-win64.sh
@@ -15,7 +15,7 @@ fi
 cd winbuild
 
 # TODO: potential Arch-ism?
-x86_64-w64-mingw32-cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_C_FLAGS="-O2" -DCMAKE_CXX_FLAGS="-O2 -Wall -Wextra -Wno-unused-parameter -Wno-cast-function-type -Wno-deprecated-declarations -Wno-stringop-truncation -Werror" -DWITH_LOCALE=ON -DUSE_MOMO=ON -DUSE_BACKWARD=ON .. || exit 1
+x86_64-w64-mingw32-cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_C_FLAGS="-O2" -DCMAKE_CXX_FLAGS="-O2 -Wall -Wextra -Wno-unused-parameter -Wno-cast-function-type -Wno-deprecated-declarations -Werror" -DWITH_LOCALE=ON -DUSE_MOMO=ON -DUSE_BACKWARD=ON .. || exit 1
 make -j8 || exit 1
 
 cd ..
diff --git a/scripts/release-winxp.sh b/scripts/release-winxp.sh
index 7350df2e7..904fdca7d 100755
--- a/scripts/release-winxp.sh
+++ b/scripts/release-winxp.sh
@@ -15,7 +15,7 @@ fi
 cd xpbuild
 
 # TODO: potential Arch-ism?
-i686-w64-mingw32-cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_C_FLAGS="-O2" -DCMAKE_CXX_FLAGS="-O2 -Wall -Wextra -Wno-unused-parameter -Wno-stringop-truncation -Wno-cast-function-type" -DBUILD_SHARED_LIBS=OFF -DSUPPORT_XP=ON -DWITH_RENDER_DX11=OFF -DSDL_SSE=OFF -DSDL_SSE2=OFF -DSDL_SSE3=OFF -DENABLE_SSE=OFF -DENABLE_SSE2=OFF -DENABLE_AVX=OFF -DENABLE_AVX2=OFF -DUSE_BACKWARD=ON -DCONSOLE_SUBSYSTEM=OFF -DWITH_LOCALE=ON -DUSE_MOMO=ON .. || exit 1
+i686-w64-mingw32-cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_C_FLAGS="-O2" -DCMAKE_CXX_FLAGS="-O2 -Wall -Wextra -Wno-unused-parameter -Wno-cast-function-type" -DBUILD_SHARED_LIBS=OFF -DSUPPORT_XP=ON -DWITH_RENDER_DX11=OFF -DSDL_SSE=OFF -DSDL_SSE2=OFF -DSDL_SSE3=OFF -DENABLE_SSE=OFF -DENABLE_SSE2=OFF -DENABLE_AVX=OFF -DENABLE_AVX2=OFF -DUSE_BACKWARD=ON -DCONSOLE_SUBSYSTEM=OFF -DWITH_LOCALE=ON -DUSE_MOMO=ON .. || exit 1
 make -j8 || exit 1
 
 cd ..
diff --git a/src/main.cpp b/src/main.cpp
index de6a2f045..b97c04355 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -593,12 +593,13 @@ int main(int argc, char** argv) {
 #endif
 
     char exePath[4096];
-#ifdef ANDROID
     memset(exePath,0,4096);
-#else
+#ifndef ANDROID
     if (!getExePath(argv[0],exePath,4095)) memset(exePath,0,4096);
 #endif
 
+    memset(localeDir,0,4096);
+
     bool textDomainBound=false;
     for (int i=0; localeDirs[i]; i++) {
 #ifdef ANDROID