X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fwim.c;h=b15a02de43881c68b597d5dec778bc67541e0510;hp=2a3c08c10eda14a8e58453736a8095f455620336;hb=4587a5137d9e06b2863e37006f1ebd042eefc0e3;hpb=ccba46cf8eb7849d340b24b035497ea50fb821b9

diff --git a/src/wim.c b/src/wim.c
index 2a3c08c1..b15a02de 100644
--- a/src/wim.c
+++ b/src/wim.c
@@ -125,6 +125,8 @@ wimlib_create_new_wim(int ctype, WIMStruct **w_ret)
 	struct wim_lookup_table *table;
 	int ret;
 
+	wimlib_global_init(WIMLIB_INIT_FLAG_ASSUME_UTF8);
+
 	DEBUG("Creating new WIM with %"TS" compression.",
 	      wimlib_get_compression_type_string(ctype));
 
@@ -634,6 +636,8 @@ wimlib_open_wim(const tchar *wim_file, int open_flags,
 	WIMStruct *wim;
 	int ret;
 
+	wimlib_global_init(WIMLIB_INIT_FLAG_ASSUME_UTF8);
+
 	ret = WIMLIB_ERR_INVALID_PARAM;
 	if (!wim_file || !wim_ret)
 		goto out;
@@ -880,6 +884,10 @@ test_locale_ctype_utf8(void)
 WIMLIBAPI int
 wimlib_global_init(int init_flags)
 {
+	static bool already_inited = false;
+
+	if (already_inited)
+		return 0;
 	libxml_global_init();
 	if (!(init_flags & WIMLIB_INIT_FLAG_ASSUME_UTF8)) {
 		wimlib_mbs_is_utf8 = test_locale_ctype_utf8();
@@ -891,6 +899,7 @@ wimlib_global_init(int init_flags)
 #ifdef __WIN32__
 	win32_global_init();
 #endif
+	already_inited = true;
 	return 0;
 }