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

Merge branch 'master' of ssh://github.com/86Box/86Box into version/4.1

Browse Source 
# Conflicts:
#	CMakeLists.txt
#	debian/changelog
#	src/include_make/86box/version.h
#	src/unix/assets/86Box.spec
#	src/unix/assets/net.86box.86Box.metainfo.xml
#	vcpkg.json
This commit is contained in:
RichardG867
2023-10-23 15:42:06 -03:00
parent 28e76df961 5c5b286358
commit bc522612c7
75 changed files with 1890 additions and 1123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/network/network.c
View File

@@ -584,7 +584,8 @@ network_reset(void)
}
net_card_current = i;
device_add_inst(net_cards[net_cards_conf[i].device_num], i + 1);
if (net_cards_conf[i].device_num > NET_INTERNAL)
device_add_inst(net_cards[net_cards_conf[i].device_num], i + 1);
}
}
@@ -689,7 +690,8 @@ network_dev_available(int id)
{
int available = (net_cards_conf[id].device_num > 0);
if (net_cards_conf[id].net_type == NET_TYPE_PCAP && (network_dev_to_id(net_cards_conf[id].host_dev_name) <= 0))
if ((net_cards_conf[id].net_type == NET_TYPE_PCAP) &&
(network_dev_to_id(net_cards_conf[id].host_dev_name) <= 0))
available = 0;
// TODO: Handle VDE device