claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/OBattler/86Box

Browse Source 
# Conflicts:
#	src/config.c
This commit is contained in:
waltje
2017-10-11 05:45:16 -04:00
parent c7cb446684 89ec4e0fa7
commit 47c027bc46
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/config.c
View File

@@ -8,7 +8,11 @@
* *
* Configuration file handler. * Configuration file handler.
* *
<<<<<<< HEAD
* Version: @(#)config.c 1.0.16 2017/10/10 * Version: @(#)config.c 1.0.16 2017/10/10
=======
* Version: @(#)config.c 1.0.16 2017/10/11
>>>>>>> 89ec4e0fa703eacfdada3ab3d55f885bc28522f1
* *
* Authors: Sarah Walker, * Authors: Sarah Walker,
* Miran Grca, <mgrca8@gmail.com> * Miran Grca, <mgrca8@gmail.com>
@@ -1958,6 +1962,7 @@ config_set_wstring(char *head, char *name, wchar_t *val)
entry = create_entry(section, name); entry = create_entry(section, name);
memcpy(entry->wdata, val, 512); memcpy(entry->wdata, val, 512);
wcstombs(entry->data, entry->wdata, 256);
} }