mirror of
https://github.com/unraid/webgui.git
synced 2026-01-29 04:59:17 -06:00
Merge remote-tracking branch 'upstream/master' into multi-language
This commit is contained in:
@@ -79,8 +79,16 @@ foreach ($vms as $vm) {
|
||||
$graphics = 'VNC:auto';
|
||||
} elseif (!empty($arrConfig['gpu'])) {
|
||||
$arrValidGPUDevices = getValidGPUDevices();
|
||||
foreach ($arrConfig['gpu'] as $arrGPU) foreach ($arrValidGPUDevices as $arrDev) {
|
||||
if ($arrGPU['id'] == $arrDev['id']) $graphics .= $arrDev['name']."\n";
|
||||
foreach ($arrConfig['gpu'] as $arrGPU) {
|
||||
foreach ($arrValidGPUDevices as $arrDev) {
|
||||
if ($arrGPU['id'] == $arrDev['id']) {
|
||||
if (count(array_filter($arrValidGPUDevices, function($v) use ($arrDev) { return $v['name'] == $arrDev['name']; })) > 1) {
|
||||
$graphics .= $arrDev['name'].' ('.$arrDev['id'].')'."\n";
|
||||
} else {
|
||||
$graphics .= $arrDev['name']."\n";
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
$graphics = str_replace("\n", "<br>", trim($graphics));
|
||||
}
|
||||
@@ -161,4 +169,4 @@ foreach ($vms as $vm) {
|
||||
echo "</td></tr>";
|
||||
}
|
||||
echo "\0".implode($menu).implode($kvm);
|
||||
?>
|
||||
?>
|
||||
|
||||
Reference in New Issue
Block a user