Merge from trunk

2019-04-18 20:46:38 +01:00 · 2019-04-18 20:46:38 +01:00 · 50e7de5214
commit 50e7de5214
parent 4b7328f06e 0a5198828a
282 changed files with 51494 additions and 22451 deletions
--- a/src/wx-config.c
+++ b/src/wx-config.c
@ -557,7 +557,7 @@ int config_dlgsave(void* hdlg)

                        if (has_been_inited)
                        {
-                                mem_resize();
+                                mem_alloc();
                                loadbios();
                                resetpchard();
                        }