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

Applied a whole slew of patches, getting RAM usage down by a further 10 MB.

Browse Source
This commit is contained in:
OBattler
2018-03-19 01:02:04 +01:00
parent b6c393cc91
commit b1efb99ed6
222 changed files with 9538 additions and 9980 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/config.c
View File

@@ -8,7 +8,7 @@
*
* Configuration file handler.
*
* Version: @(#)config.c 1.0.45 2018/03/17
* Version: @(#)config.c 1.0.46 2018/03/18
*
* Authors: Sarah Walker,
* Miran Grca, <mgrca8@gmail.com>
@@ -55,7 +55,6 @@
#include "sound/sound.h"
#include "video/video.h"
#include "plat.h"
#include "plat_joystick.h"
#include "plat_midi.h"
#include "ui.h"
@@ -649,22 +648,27 @@ load_network(void)
} else
network_type = NET_TYPE_NONE;
memset(network_pcap, '\0', sizeof(network_pcap));
p = config_get_string(cat, "net_pcap_device", NULL);
memset(network_host, '\0', sizeof(network_host));
p = config_get_string(cat, "net_host_device", NULL);
if (p == NULL) {
p = config_get_string(cat, "net_host_device", NULL);
if (p != NULL)
config_delete_var(cat, "net_host_device");
}
if (p != NULL) {
if ((network_dev_to_id(p) == -1) || (network_ndev == 1)) {
if ((network_ndev == 1) && strcmp(network_pcap, "none")) {
if ((network_ndev == 1) && strcmp(network_host, "none")) {
ui_msgbox(MBX_ERROR, (wchar_t *)IDS_2140);
} else if (network_dev_to_id(p) == -1) {
ui_msgbox(MBX_ERROR, (wchar_t *)IDS_2141);
}
strcpy(network_pcap, "none");
strcpy(network_host, "none");
} else {
strcpy(network_pcap, p);
strcpy(network_host, p);
}
} else
strcpy(network_pcap, "none");
strcpy(network_host, "none");
p = config_get_string(cat, "net_card", NULL);
if (p != NULL)
@@ -1752,14 +1756,14 @@ save_network(void)
config_set_string(cat, "net_type",
(network_type == NET_TYPE_SLIRP) ? "slirp" : "pcap");
if (network_pcap[0] != '\0') {
if (! strcmp(network_pcap, "none"))
config_delete_var(cat, "net_pcap_device");
if (network_host[0] != '\0') {
if (! strcmp(network_host, "none"))
config_delete_var(cat, "net_host_device");
else
config_set_string(cat, "net_pcap_device", network_pcap);
config_set_string(cat, "net_host_device", network_host);
} else {
/* config_set_string(cat, "net_pcap_device", "none"); */
config_delete_var(cat, "net_pcap_device");
/* config_set_string(cat, "net_host_device", "none"); */
config_delete_var(cat, "net_host_device");
}
if (network_card == 0)