Merge branch 'maint-0.3.1' into release-0.3.1

2017-07-13 16:52:20 -04:00 · 2017-07-13 16:52:20 -04:00 · 11b2d36db3
parent 4d52b740f9 1ea155b28f
commit 11b2d36db3
2 changed files with 6 additions and 1 deletions
--- a/changes/bug22520
+++ b/changes/bug22520
@ -0,0 +1,5 @@
+  o Minor bugfixes (error reporting, windows):
+    - When formatting Windows error messages, use the English format
+      to avoid codepage issues. Fixes bug 22520; bugfix on
+      0.1.2.8-alpha. Patch from "Vort".
+
--- a/src/common/compat.c
+++ b/src/common/compat.c
@ -3261,7 +3261,7 @@ format_win32_error(DWORD err)
                 FORMAT_MESSAGE_FROM_SYSTEM |
                 FORMAT_MESSAGE_IGNORE_INSERTS,
                 NULL, err,
-                 MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
+                 MAKELANGID(LANG_ENGLISH, SUBLANG_DEFAULT),
                 (LPVOID)&str,
                 0, NULL);