Merge branch 'master' of https://github.com/86Box/86Box
This commit is contained in:
@@ -857,6 +857,9 @@ MediaMenu::nicUpdateMenu(int i)
|
||||
case NET_TYPE_PCAP:
|
||||
netType = "PCAP";
|
||||
break;
|
||||
case NET_TYPE_VDE:
|
||||
netType = "VDE";
|
||||
break;
|
||||
}
|
||||
|
||||
QString devName = DeviceConfig::DeviceName(network_card_getdevice(net_cards_conf[i].device_num), network_card_get_internal_name(net_cards_conf[i].device_num), 1);
|
||||
|
@@ -148,7 +148,7 @@ SettingsNetwork::onCurrentMachineChanged(int machineId)
|
||||
|
||||
selectedRow = 0;
|
||||
|
||||
if (net_cards_conf[i].net_type == NET_TYPE_PCAP) {
|
||||
if (network_ndev > 0) {
|
||||
QString currentPcapDevice = net_cards_conf[i].host_dev_name;
|
||||
cbox = findChild<QComboBox *>(QString("comboBoxIntf%1").arg(i + 1));
|
||||
model = cbox->model();
|
||||
@@ -161,7 +161,8 @@ SettingsNetwork::onCurrentMachineChanged(int machineId)
|
||||
}
|
||||
model->removeRows(0, removeRows);
|
||||
cbox->setCurrentIndex(selectedRow);
|
||||
} else if (net_cards_conf[i].net_type == NET_TYPE_VDE) {
|
||||
}
|
||||
if (net_cards_conf[i].net_type == NET_TYPE_VDE) {
|
||||
QString currentVdeSocket = net_cards_conf[i].host_dev_name;
|
||||
auto editline = findChild<QLineEdit *>(QString("socketVDENIC%1").arg(i+1));
|
||||
editline->setText(currentVdeSocket);
|
||||
|
Reference in New Issue
Block a user