mike/systeminformation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

graphics() improving display detection (windows)

Browse Source
This commit is contained in:
Sebastian Hildebrandt 2019-10-19 16:42:43 +02:00
parent 8acd0ece14
commit 8e41e83317
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/graphics.js
View File

@ -605,7 +605,7 @@ function graphics(callback) {
}); });
result.displays = parseLinesWindowsDisplaysPowershell(ssections, msections, dsections, tsections, isections); result.displays = parseLinesWindowsDisplaysPowershell(ssections, msections, dsections, tsections, isections);
if (result.controllers.length === 1 && result.displays.length === 1) { if (result.displays.length === 1) {
if (_resolutionx) { if (_resolutionx) {
result.displays[0].resolutionx = _resolutionx; result.displays[0].resolutionx = _resolutionx;
if (!result.displays[0].currentResX) { if (!result.displays[0].currentResX) {
@ -659,10 +659,10 @@ function graphics(callback) {
vram: parseInt(util.getValue(lines, 'AdapterRAM', '='), 10) / 1024 / 1024, vram: parseInt(util.getValue(lines, 'AdapterRAM', '='), 10) / 1024 / 1024,
vramDynamic: (util.getValue(lines, 'VideoMemoryType', '=') === '2') vramDynamic: (util.getValue(lines, 'VideoMemoryType', '=') === '2')
}); });
_resolutionx = util.toInt(util.getValue(lines, 'CurrentHorizontalResolution', '=')); _resolutionx = util.toInt(util.getValue(lines, 'CurrentHorizontalResolution', '=')) || _resolutionx;
_resolutiony = util.toInt(util.getValue(lines, 'CurrentVerticalResolution', '=')); _resolutiony = util.toInt(util.getValue(lines, 'CurrentVerticalResolution', '=')) || _resolutiony;
_refreshrate = util.toInt(util.getValue(lines, 'CurrentRefreshRate', '=')); _refreshrate = util.toInt(util.getValue(lines, 'CurrentRefreshRate', '=')) || _refreshrate;
_pixeldepth = util.toInt(util.getValue(lines, 'CurrentBitsPerPixel', '=')); _pixeldepth = util.toInt(util.getValue(lines, 'CurrentBitsPerPixel', '=')) || _pixeldepth;
} }
} }
} }
@ -725,7 +725,7 @@ function graphics(callback) {
let displayVendor = ''; let displayVendor = '';
let displayModel = ''; let displayModel = '';
isections.forEach(element => { isections.forEach(element => {
if (element.instanceId.toLowerCase() === instanceName) { if (element.instanceId.toLowerCase().startsWith(instanceName)) {
displayVendor = element.vendor; displayVendor = element.vendor;
displayModel = element.model; displayModel = element.model;
} }